Merging upstream version 0.9.0+20150723.

CMakeLists.txt

@@ -7,21 +7,24 @@ find_program(SED_PROGRAM sed)
 # additional cmake files
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 
-# Support Qt5
-option(USE_QT5 "Build with Qt5." $ENV{USE_QT5})
+include(GNUInstallDirs)
+
+# Support Qt4 for the time being
+option(USE_QT4 "Build with Qt4." $ENV{USE_QT4})
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 set(CMAKE_AUTOMOC ON)
-if(USE_QT5)
+
+if(USE_QT4)
+  find_package(Qt4 REQUIRED QtCore QtGui) # Qt
+  include(${QT_USE_FILE})
+  message(STATUS "Building with Qt${QTVERSION}")
+else()
   cmake_minimum_required(VERSION 2.8.11)
   find_package(Qt5Widgets REQUIRED)
   find_package(Qt5X11Extras REQUIRED)
   find_package(Qt5LinguistTools REQUIRED QUIET)
   message(STATUS "Building with Qt${Qt5Core_VERSION_STRING}")
-else()
-  find_package(Qt4 REQUIRED QtCore QtGui) # Qt
-  include(${QT_USE_FILE})
-  message(STATUS "Building with Qt${QTVERSION}")
 endif()
 
 find_package(PkgConfig)
@@ -40,7 +43,7 @@ add_subdirectory(src)
 # install an icon for the application
 install(
   FILES data/obconf-qt.png
-  DESTINATION share/icons/hicolor/48x48/apps
+  DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/48x48/apps"
 )
 
 # building tarball with CPack -------------------------------------------------

src/CMakeLists.txt

@@ -1,12 +1,12 @@
 # set visibility to hidden to hide symbols, unlesss they're exporeted manually in the code
-set(CMAKE_CXX_FLAGS "-DQT_NO_KEYWORDS -fno-exceptions")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_NO_KEYWORDS -fno-exceptions")
 
-if(USE_QT5)
-    set(QTX_INCLUDE_DIRS "")
-    set(QTX_LIBRARIES Qt5::Widgets Qt5::X11Extras)
-else()
+if(USE_QT4)
     set(QTX_INCLUDE_DIRS ${QT_QTCORE_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} ${QT_QTDBUS_DIR})
     set(QTX_LIBRARIES ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTDBUS_LIBRARY})
+else()
+    set(QTX_INCLUDE_DIRS "")
+    set(QTX_LIBRARIES Qt5::Widgets Qt5::X11Extras)
 endif()
 
 include_directories(
@@ -36,10 +36,10 @@ set(obconf-qt_UIS
   obconf.ui
 )
 
-if(USE_QT5)
-  qt5_wrap_ui(obconf-qt_UI_H ${obconf-qt_UIS})
-else()
+if(USE_QT4)
   qt4_wrap_ui(obconf-qt_UI_H ${obconf-qt_UIS})
+else()
+  qt5_wrap_ui(obconf-qt_UI_H ${obconf-qt_UIS})
 endif()
 
 # The ui code generated by Qt uic contains QMetaObject::connectSlotsByName()
@@ -61,37 +61,37 @@ option (UPDATE_TRANSLATIONS "Update source translation translations/*.ts files"
 set(TRANSLATION_TEMPLATE "translations/obconf-qt.ts")
 file(GLOB TS_FILES translations/obconf-qt_*.ts)
 
-if(USE_QT5)
+if(USE_QT4)
   if (UPDATE_TRANSLATIONS)
-    qt5_create_translation(QMS_FILES
+    qt4_create_translation(QMS_FILES
       ${obconf-qt_SRCS}
       ${obconf-qt_UI_H}
       ${TRANSLATION_TEMPLATE}
       OPTIONS -locations absolute)
-    qt5_create_translation(QM_FILES
+    qt4_create_translation(QMS_FILES
       ${obconf-qt_SRCS}
       ${obconf-qt_UI_H}
       ${TS_FILES}
       OPTIONS -locations absolute)
   else (UPDATE_TRANSLATIONS)
-    qt5_add_translation(QM_FILES ${TS_FILES})
+    qt4_add_translation(QM_FILES ${TS_FILES})
   endif (UPDATE_TRANSLATIONS)
-else(USE_QT5) # use qt4
+else(USE_QT4) # use qt4
   if (UPDATE_TRANSLATIONS)
-    qt4_create_translation(QMS_FILES
+    qt5_create_translation(QMS_FILES
       ${obconf-qt_SRCS}
       ${obconf-qt_UI_H}
       ${TRANSLATION_TEMPLATE}
       OPTIONS -locations absolute)
-    qt4_create_translation(QMS_FILES
+    qt5_create_translation(QM_FILES
       ${obconf-qt_SRCS}
       ${obconf-qt_UI_H}
       ${TS_FILES}
       OPTIONS -locations absolute)
   else (UPDATE_TRANSLATIONS)
-    qt4_add_translation(QM_FILES ${TS_FILES})
+    qt5_add_translation(QM_FILES ${TS_FILES})
   endif (UPDATE_TRANSLATIONS)
-endif(USE_QT5)
+endif(USE_QT4)
 
 if(UPDATE_TRANSLATIONS)
     add_custom_target(update_obconf-qt_translations ALL DEPENDS ${QMS})
@@ -117,9 +117,9 @@ add_executable(obconf-qt
 )
 
 add_definitions(
-  -DPACKAGE_DATA_DIR="${CMAKE_INSTALL_PREFIX}/share/obconf-qt"
-  -DPIXMAPS_DIR="${CMAKE_INSTALL_PREFIX}/share/pixmaps"
-  -DTHEME_DIR="{CMAKE_INSTALL_PREFIX}/share/openbox/themes"
+  -DPACKAGE_DATA_DIR="${CMAKE_INSTALL_FULL_DATAROOTDIR}/obconf-qt"
+  -DPIXMAPS_DIR="${CMAKE_INSTALL_FULL_DATAROOTDIR}/pixmaps"
+  -DTHEME_DIR="${CMAKE_INSTALL_FULL_DATAROOTDIR}/openbox/themes"
 )
 
 target_link_libraries(obconf-qt

src/desktops.cpp

@@ -25,7 +25,6 @@
 #include "tree.h"
 
 #include <QX11Info>
-// FIXME: how to support XCB or Wayland?
 #include <X11/Xlib.h>
 
 using namespace Obconf;
@@ -46,92 +45,28 @@ void MainDialog::desktops_setup_tab() {
 
   gint i;
 
-#if 0
-  // FIXME
-  GtkWidget* w;
-  GtkCellRenderer* render;
-  GtkTreeViewColumn* column;
-
-  w = get_widget("desktop_names");
-  desktop_store = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_BOOLEAN);
-  gtk_tree_view_set_model(GTK_TREE_VIEW(w), GTK_TREE_MODEL(desktop_store));
-  g_object_unref(desktop_store);
-
-  gtk_tree_selection_set_mode(gtk_tree_view_get_selection(GTK_TREE_VIEW(w)),
-                              GTK_SELECTION_SINGLE);
-
-  render = gtk_cell_renderer_text_new();
-  g_signal_connect(render, "edited",
-                   G_CALLBACK(on_desktop_names_cell_edited),
-                   NULL);
-
-  column = gtk_tree_view_column_new_with_attributes
-           ("Name", render, "text", 0, "editable", 1, NULL);
-  gtk_tree_view_append_column(GTK_TREE_VIEW(w), column);
-
-#endif
-
   desktops_read_names();
 
   i = tree_get_int("desktops/popupTime", 875);
   ui.desktop_popup->setChecked(i != 0);
   ui.desktop_popup_time->setValue(i ? i : 875);
-  // FIXME enable_stuff();
 }
 
-/* FIXME
- * static void enable_stuff() {
- *  GtkWidget* w;
- *  gboolean b;
- *
- *  w = get_widget("desktop_popup");
- *  b = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w));
- *  w = get_widget("desktop_popup_time");
- *  gtk_widget_set_sensitive(w, b);
- }
- */
-
 void MainDialog::on_desktop_num_valueChanged(int newValue) {
   num_desktops = newValue;
   desktops_write_number();
   desktops_read_names();
 }
 
-#if 0
-// FIXME
-
-static void MainDialog::on_desktop_names_cell_edited(GtkCellRendererText* cell,
-    const gchar* path_string,
-    const gchar* new_text,
-    gpointer data) {
-  GtkTreePath* path;
-  GtkTreeIter it;
-  gchar* old_text;
-  GList* lit;
-  gint i;
-
-  path = gtk_tree_path_new_from_string(path_string);
-  gtk_tree_model_get_iter(GTK_TREE_MODEL(desktop_store), &it, path);
-
-  gtk_tree_model_get(GTK_TREE_MODEL(desktop_store), &it, 0, &old_text, -1);
-  g_free(old_text);
-
-  i = gtk_tree_path_get_indices(path)[0];
-  lit = g_list_nth(desktop_names, i);
-
-  g_free(lit->data);
-  lit->data = g_strdup(new_text);
+void MainDialog::on_desktop_names_itemChanged(QListWidgetItem * item) {
+  QString new_text = item->text();
 
-  if(new_text[0])  /* not empty */
-    gtk_list_store_set(desktop_store, &it, 0, lit->data, -1);
-  else
-    gtk_list_store_set(desktop_store, &it, 0, _("(Unnamed desktop)"), -1);
+  if(new_text.isEmpty())
+    item->setText(tr("(Unnamed desktop)"));
 
   desktops_write_names();
 }
 
-#endif
-
 void MainDialog::desktops_read_names() {
   xmlNodePtr n;
   gint i;
@@ -151,7 +86,9 @@ void MainDialog::desktops_read_names() {
       if(desktop_name.isEmpty())
         desktop_name = tr("(Unnamed desktop)");
 
-      ui.desktop_names->addItem(desktop_name);
+      QListWidgetItem* item = new QListWidgetItem(desktop_name);
+      item->setFlags(item->flags() | Qt::ItemIsEditable);
+      ui.desktop_names->addItem(item);
       ++i;
     }
 
@@ -159,7 +96,9 @@ void MainDialog::desktops_read_names() {
   }
 
   while(i < num_desktops) {
-    ui.desktop_names->addItem(tr("(Unnamed desktop)"));
+    QListWidgetItem* item = new QListWidgetItem(tr("(Unnamed desktop)"));
+    item->setFlags(item->flags() | Qt::ItemIsEditable);
+    ui.desktop_names->addItem(item);
     ++i;
   }
 }
@@ -216,10 +155,9 @@ void MainDialog::on_desktop_popup_toggled(bool checked) {
   }
   else
     tree_set_int("desktops/popupTime", 0);
-
-  // FIXME enable_stuff();
 }
 
 void MainDialog::on_desktop_popup_time_valueChanged(int newValue) {
   tree_set_int("desktops/popupTime", newValue);
 }
+

src/dock.cpp

@@ -66,147 +66,84 @@ void MainDialog::dock_setup_tab() {
 
   g_free(s);
 
-#if 0
-  // FIXME
-  w = get_widget("dock_position");
-  gtk_option_menu_set_history(GTK_OPTION_MENU(w), pos);
+  ui.dock_position->setCurrentIndex(pos);
 
-  w = get_widget("dock_float_x");
-  gtk_spin_button_set_value(GTK_SPIN_BUTTON(w),
-                            tree_get_int("dock/floatingX", 0));
+  bool is_floating = (pos == POSITION_FLOATING);
+  ui.dock_float_x->setEnabled(is_floating);
+  ui.dock_float_y->setEnabled(is_floating);
 
-  w = get_widget("dock_float_y");
-  gtk_spin_button_set_value(GTK_SPIN_BUTTON(w),
-                            tree_get_int("dock/floatingY", 0));
+  ui.dock_float_x->setValue(tree_get_int("dock/floatingX", 0));
+  ui.dock_float_y->setValue(tree_get_int("dock/floatingY", 0));
 
   s = tree_get_string("dock/stacking", "Above");
-
   if(!strcasecmp(s, "Normal"))
-    w = get_widget("dock_stack_normal");
+    ui.dock_stack_normal->setChecked(true);
   else if(!strcasecmp(s, "Below"))
-    w = get_widget("dock_stack_bottom");
+    ui.dock_stack_bottom->setChecked(true);
   else
-    w = get_widget("dock_stack_top");
-
+    ui.dock_stack_top->setChecked(true);
   g_free(s);
-  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w), TRUE);
 
-  w = get_widget("dock_direction");
   s = tree_get_string("dock/direction", "Vertical");
 
   if(!strcasecmp(s, "Horizontal")) pos = DIRECTION_HORIZONTAL;
   else                              pos = DIRECTION_VERTICAL;
 
   g_free(s);
-  gtk_option_menu_set_history(GTK_OPTION_MENU(w), pos);
-
-  w = get_widget("dock_nostrut");
-  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
-                               tree_get_bool("dock/noStrut", FALSE));
-
-  w = get_widget("dock_hide");
-  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
-                               tree_get_bool("dock/autoHide", FALSE));
-
-  w = get_widget("dock_hide_delay");
-  gtk_spin_button_set_value(GTK_SPIN_BUTTON(w),
-                            tree_get_int("dock/hideDelay", 300));
-
-  w = get_widget("dock_show_delay");
-  gtk_spin_button_set_value(GTK_SPIN_BUTTON(w),
-                            tree_get_int("dock/showDelay", 300));
-
-  dock_enable_stuff();
-
-#endif
-}
-
-static void dock_enable_stuff() {
-  /* FIXME
-   *  GtkWidget* w, *s;
-   *  gboolean b;
-   *
-   *  w = get_widget("dock_position");
-   *  b = gtk_option_menu_get_history(GTK_OPTION_MENU(w)) == POSITION_FLOATING;
-   *
-   *  s = get_widget("dock_float_x");
-   *  gtk_widget_set_sensitive(s, b);
-   *  s = get_widget("dock_float_y");
-   *  gtk_widget_set_sensitive(s, b);
-   *  s = get_widget("dock_float_label");
-   *  gtk_widget_set_sensitive(s, b);
-   *  s = get_widget("dock_float_label_x");
-   *  gtk_widget_set_sensitive(s, b);
-   *  s = get_widget("dock_nostrut");
-   *  gtk_widget_set_sensitive(s, !b);
-   *
-   *  w = get_widget("dock_hide");
-   *  b = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w));
-   *
-   *  s = get_widget("dock_hide_delay");
-   *  gtk_widget_set_sensitive(s, b);
-   *  s = get_widget("dock_hide_label");
-   *  gtk_widget_set_sensitive(s, b);
-   *  s = get_widget("dock_hide_label_units");
-   *  gtk_widget_set_sensitive(s, b);
-   *  s = get_widget("dock_show_delay");
-   *  gtk_widget_set_sensitive(s, b);
-   *  s = get_widget("dock_show_label");
-   *  gtk_widget_set_sensitive(s, b);
-   *  s = get_widget("dock_show_label_units");
-   *  gtk_widget_set_sensitive(s, b);
-   */
-}
-
-#if 0
-//FIXME
-void MainDialog::on_dock_top_left_activate(GtkMenuItem* w, gpointer data) {
-  tree_set_string("dock/position", "TopLeft");
-  dock_enable_stuff();
-}
-
-void MainDialog::on_dock_top_activate(GtkMenuItem* w, gpointer data) {
-  tree_set_string("dock/position", "Top");
-  dock_enable_stuff();
-}
-
-void MainDialog::on_dock_top_right_activate(GtkMenuItem* w, gpointer data) {
-  tree_set_string("dock/position", "TopRight");
-  dock_enable_stuff();
+  ui.dock_direction->setCurrentIndex(pos);
+
+  ui.dock_nostrut->setChecked(tree_get_bool("dock/noStrut", FALSE));
+
+  bool auto_hide = tree_get_bool("dock/autoHide", FALSE);
+  ui.dock_hide->setChecked(auto_hide);
+
+  ui.dock_hide_delay->setEnabled(auto_hide);
+  ui.dock_hide_delay->setValue(tree_get_int("dock/hideDelay", 300));
+
+  ui.dock_show_delay->setEnabled(auto_hide);
+  ui.dock_show_delay->setValue(tree_get_int("dock/showDelay", 300));
+}
+
+void MainDialog::on_dock_position_currentIndexChanged(int index) {
+  const char* val;
+  bool is_floating = false;
+  switch(index) {
+    case POSITION_TOPLEFT:
+    default:
+      val = "TopLeft";
+      break;
+    case POSITION_TOP:
+      val = "Top";
+      break;
+    case POSITION_TOPRIGHT:
+      val = "TopRight";
+      break;
+    case POSITION_LEFT:
+      val = "Left";
+      break;
+    case POSITION_RIGHT:
+      val = "Right";
+      break;
+    case POSITION_BOTTOMLEFT:
+      val = "BottomLeft";
+      break;
+    case POSITION_BOTTOM:
+      val = "Bottom";
+      break;
+    case POSITION_BOTTOMRIGHT:
+      val = "BottomRight";
+      break;
+    case POSITION_FLOATING:
+      val = "Floating";
+      is_floating = true;
+      break;
+  }
+  tree_set_string("dock/position", val);
+
+  ui.dock_float_x->setEnabled(is_floating);
+  ui.dock_float_y->setEnabled(is_floating);
 }
 
-void MainDialog::on_dock_left_activate(GtkMenuItem* w, gpointer data) {
-  tree_set_string("dock/position", "Left");
-  dock_enable_stuff();
-}
-
-void MainDialog::on_dock_right_activate(GtkMenuItem* w, gpointer data) {
-  tree_set_string("dock/position", "Right");
-  dock_enable_stuff();
-}
-
-void MainDialog::on_dock_bottom_left_activate(GtkMenuItem* w, gpointer data) {
-  tree_set_string("dock/position", "BottomLeft");
-  dock_enable_stuff();
-}
-
-void MainDialog::on_dock_bottom_activate(GtkMenuItem* w, gpointer data) {
-  tree_set_string("dock/position", "Bottom");
-  dock_enable_stuff();
-}
-
-void MainDialog::on_dock_bottom_right_activate(GtkMenuItem* w, gpointer data) {
-  tree_set_string("dock/position", "BottomRight");
-  dock_enable_stuff();
-}
-
-void MainDialog::on_dock_floating_activate(GtkMenuItem* w, gpointer data) {
-  tree_set_string("dock/position", "Floating");
-  dock_enable_stuff();
-}
-
-#endif
-
 void MainDialog::on_dock_float_x_valueChanged(int newValue) {
   tree_set_int("dock/floatingX", newValue);
 }
@@ -215,31 +152,25 @@ void MainDialog::on_dock_float_y_valueChanged(int newValue) {
   tree_set_int("dock/floatingY", newValue);
 }
 
-void MainDialog::on_dock_stacking_top_toggled(bool checked) {
+void MainDialog::on_dock_stack_top_toggled(bool checked) {
   if(checked)
     tree_set_string("dock/stacking", "Above");
 }
 
-void MainDialog::on_dock_stacking_normal_toggled(bool checked) {
+void MainDialog::on_dock_stack_normal_toggled(bool checked) {
   if(checked)
     tree_set_string("dock/stacking", "Normal");
 }
 
-void MainDialog::on_dock_stacking_bottom_toggled(bool checked) {
+void MainDialog::on_dock_stack_bottom_toggled(bool checked) {
   if(checked)
     tree_set_string("dock/stacking", "Below");
 }
 
-#if 0
-// FIXME
-void MainDialog::on_dock_horizontal_activate(GtkMenuItem* w, gpointer data) {
-  tree_set_string("dock/direction", "Horizontal");
-}
-
-void MainDialog::on_dock_vertical_activate(GtkMenuItem* w, gpointer data) {
-  tree_set_string("dock/direction", "Vertical");
+void MainDialog::on_dock_direction_currentIndexChanged(int index) {
+  const char* val = (index == DIRECTION_VERTICAL ? "Vertical" : "Horizontal");
+  tree_set_string("dock/direction", val);
 }
-#endif
 
 void MainDialog::on_dock_nostrut_toggled(bool checked) {
   tree_set_bool("dock/noStrut", checked);
@@ -247,7 +178,6 @@ void MainDialog::on_dock_nostrut_toggled(bool checked) {
 
 void MainDialog::on_dock_hide_toggled(bool checked) {
   tree_set_bool("dock/autoHide", checked);
-  dock_enable_stuff();
 }
 
 void MainDialog::on_dock_hide_delay_valueChanged(int newValue) {
@@ -258,3 +188,4 @@ void MainDialog::on_dock_show_delay_valueChanged(int newValue) {
   tree_set_int("dock/showDelay", newValue);
 }
 
+

src/maindialog.cpp

@@ -75,9 +75,10 @@ void MainDialog::reject() {
 void MainDialog::on_about_clicked() {
   QMessageBox::about(this, tr("About ObConf-Qt"),
                      tr("A preferences manager for Openbox\n\n"
-                        "Copyright (c) 2003-2013\n\n"
+                        "Copyright (c) 2014-2015\n\n"
                         "Authors:\n"
-                        "* Hong Jen Yee (PCMan) <pcman.tw@gmail.com>\n"
+                        "* Hong Jen Yee (PCMan) <pcman.tw@gmail.com>\n\n"
+                        "The program is based on ObConf developed by the following developers.\n"
                         "* Dana Jansens <danakj@orodu.net>\n"
                         "* Tim Riley <tr@slackzone.org>\n"
                         "* Javeed Shaikh <syscrash2k@gmail.com>")

src/maindialog.h

@@ -141,17 +141,20 @@ private Q_SLOTS:
   void on_desktop_num_valueChanged(int newValue);
   void on_desktop_popup_toggled(bool checked);
   void on_desktop_popup_time_valueChanged(int newValue);
+  void on_desktop_names_itemChanged(QListWidgetItem * item);
 
   // docks
   void on_dock_float_x_valueChanged(int newValue);
   void on_dock_float_y_valueChanged(int newValue);
-  void on_dock_stacking_top_toggled(bool checked);
-  void on_dock_stacking_normal_toggled(bool checked);
-  void on_dock_stacking_bottom_toggled(bool checked);
+  void on_dock_stack_top_toggled(bool checked);
+  void on_dock_stack_normal_toggled(bool checked);
+  void on_dock_stack_bottom_toggled(bool checked);
   void on_dock_nostrut_toggled(bool checked);
   void on_dock_hide_toggled(bool checked);
   void on_dock_hide_delay_valueChanged(int newValue);
   void on_dock_show_delay_valueChanged(int newValue);
+  void on_dock_position_currentIndexChanged(int index);
+  void on_dock_direction_currentIndexChanged(int index);
 
 private:
   Ui::MainDialog ui;

src/obconf.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>541</width>
-    <height>399</height>
+    <width>595</width>
+    <height>578</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -851,6 +851,9 @@ D: Omnipresent (On all desktops)</string>
          </item>
          <item row="1" column="1">
           <widget class="QSpinBox" name="desktop_popup_time">
+           <property name="enabled">
+            <bool>false</bool>
+           </property>
            <property name="minimum">
             <number>1</number>
            </property>
@@ -1014,7 +1017,283 @@ D: Omnipresent (On all desktops)</string>
          </item>
         </layout>
        </widget>
-       <widget class="QWidget" name="dockPage"/>
+       <widget class="QWidget" name="dockPage">
+        <layout class="QVBoxLayout" name="verticalLayout_12" stretch="0,0,0,0,1">
+         <item>
+          <widget class="QLabel" name="label_14">
+           <property name="text">
+            <string>The dock is a special container for &quot;dockapps&quot;, or dock applications.  It is not visible on screen until a dockapp is run.  Dockapps can be used to show things like a clock, or to provide you with a system tray.</string>
+           </property>
+           <property name="wordWrap">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QGroupBox" name="groupBox_10">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="title">
+            <string>Position</string>
+           </property>
+           <layout class="QFormLayout" name="formLayout_8">
+            <item row="0" column="0">
+             <widget class="QLabel" name="label_36">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="text">
+               <string>&amp;Position:</string>
+              </property>
+              <property name="buddy">
+               <cstring>dock_position</cstring>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="1">
+             <widget class="QComboBox" name="dock_position">
+              <property name="currentIndex">
+               <number>-1</number>
+              </property>
+              <item>
+               <property name="text">
+                <string>Top Left</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>Top</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>Top Right</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>Left</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>Right</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>Bottom Left</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>Bottom</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>Bottom Right</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>Floating</string>
+               </property>
+              </item>
+             </widget>
+            </item>
+            <item row="1" column="0">
+             <widget class="QLabel" name="label_37">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="text">
+               <string>&amp;Floating position:</string>
+              </property>
+              <property name="buddy">
+               <cstring>dock_float_x</cstring>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="1">
+             <layout class="QHBoxLayout" name="horizontalLayout_4">
+              <item>
+               <widget class="QSpinBox" name="dock_float_x">
+                <property name="maximum">
+                 <number>10000</number>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QLabel" name="label_38">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="text">
+                 <string>x</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QSpinBox" name="dock_float_y">
+                <property name="maximum">
+                 <number>10000</number>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </item>
+            <item row="2" column="0" colspan="2">
+             <widget class="QCheckBox" name="dock_nostrut">
+              <property name="text">
+               <string>Allow &amp;windows to be placed within the dock's area</string>
+              </property>
+             </widget>
+            </item>
+            <item row="3" column="0">
+             <widget class="QLabel" name="label_39">
+              <property name="text">
+               <string>&amp;Orientation: </string>
+              </property>
+              <property name="buddy">
+               <cstring>dock_direction</cstring>
+              </property>
+             </widget>
+            </item>
+            <item row="3" column="1">
+             <widget class="QComboBox" name="dock_direction">
+              <property name="currentIndex">
+               <number>-1</number>
+              </property>
+              <item>
+               <property name="text">
+                <string>Vertical</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>Horizontal</string>
+               </property>
+              </item>
+             </widget>
+            </item>
+           </layout>
+          </widget>
+         </item>
+         <item>
+          <widget class="QGroupBox" name="groupBox_11">
+           <property name="title">
+            <string>Stacking</string>
+           </property>
+           <layout class="QVBoxLayout" name="verticalLayout_11">
+            <item>
+             <widget class="QRadioButton" name="dock_stack_top">
+              <property name="text">
+               <string>Keep dock &amp;above other windows</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QRadioButton" name="dock_stack_normal">
+              <property name="text">
+               <string>A&amp;llow dock to be both above and below windows</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QRadioButton" name="dock_stack_bottom">
+              <property name="text">
+               <string>Keep dock &amp;below other windows</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </widget>
+         </item>
+         <item>
+          <widget class="QGroupBox" name="groupBox_12">
+           <property name="title">
+            <string>Hiding</string>
+           </property>
+           <layout class="QFormLayout" name="formLayout_9">
+            <item row="1" column="0">
+             <widget class="QLabel" name="label_40">
+              <property name="text">
+               <string>&amp;Delay before hiding:</string>
+              </property>
+              <property name="buddy">
+               <cstring>dock_hide_delay</cstring>
+              </property>
+             </widget>
+            </item>
+            <item row="2" column="0">
+             <widget class="QLabel" name="label_41">
+              <property name="text">
+               <string>Delay before &amp;showing:</string>
+              </property>
+              <property name="buddy">
+               <cstring>dock_show_delay</cstring>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="1">
+             <widget class="QSpinBox" name="dock_hide_delay">
+              <property name="enabled">
+               <bool>false</bool>
+              </property>
+              <property name="maximum">
+               <number>10000</number>
+              </property>
+             </widget>
+            </item>
+            <item row="2" column="1">
+             <widget class="QSpinBox" name="dock_show_delay">
+              <property name="enabled">
+               <bool>false</bool>
+              </property>
+              <property name="maximum">
+               <number>10000</number>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="0" colspan="2">
+             <widget class="QCheckBox" name="dock_hide">
+              <property name="text">
+               <string>&amp;Hide off screen</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </widget>
+         </item>
+         <item>
+          <spacer name="verticalSpacer_6">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>20</width>
+             <height>40</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </widget>
       </widget>
      </item>
     </layout>
@@ -1058,8 +1337,8 @@ D: Omnipresent (On all desktops)</string>
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>257</x>
-     <y>494</y>
+     <x>449</x>
+     <y>567</y>
     </hint>
     <hint type="destinationlabel">
      <x>157</x>
@@ -1074,8 +1353,8 @@ D: Omnipresent (On all desktops)</string>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>325</x>
-     <y>494</y>
+     <x>517</x>
+     <y>567</y>
     </hint>
     <hint type="destinationlabel">
      <x>286</x>
@@ -1090,8 +1369,8 @@ D: Omnipresent (On all desktops)</string>
    <slot>setCurrentIndex(int)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>129</x>
-     <y>182</y>
+     <x>101</x>
+     <y>192</y>
     </hint>
     <hint type="destinationlabel">
      <x>386</x>
@@ -1099,5 +1378,53 @@ D: Omnipresent (On all desktops)</string>
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>desktop_popup</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>desktop_popup_time</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>249</x>
+     <y>35</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>249</x>
+     <y>39</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>dock_hide</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>dock_hide_delay</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>225</x>
+     <y>416</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>379</x>
+     <y>450</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>dock_hide</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>dock_show_delay</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>293</x>
+     <y>420</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>471</x>
+     <y>479</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
 </ui>

src/translations/obconf-qt_ca.ts

@@ -17,237 +17,237 @@
 <context>
     <name>MainDialog</name>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="844"/>
+        <location filename="../../build/src/ui_obconf.h" line="1027"/>
         <source>Mouse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="829"/>
+        <location filename="../../build/src/ui_obconf.h" line="1012"/>
         <source>Window Manager Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="834"/>
+        <location filename="../../build/src/ui_obconf.h" line="1017"/>
         <source>Theme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="836"/>
+        <location filename="../../build/src/ui_obconf.h" line="1019"/>
         <source>Appearance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="838"/>
+        <location filename="../../build/src/ui_obconf.h" line="1021"/>
         <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"/>
+        <location filename="../../build/src/ui_obconf.h" line="1023"/>
+        <location filename="../../build/src/ui_obconf.h" line="1038"/>
         <source>Windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="842"/>
+        <location filename="../../build/src/ui_obconf.h" line="1025"/>
         <source>Move &amp; Resize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="846"/>
+        <location filename="../../build/src/ui_obconf.h" line="1029"/>
         <source>Desktops</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="848"/>
+        <location filename="../../build/src/ui_obconf.h" line="1031"/>
         <source>Margins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="850"/>
+        <location filename="../../build/src/ui_obconf.h" line="1033"/>
         <source>Dock</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="858"/>
+        <location filename="../../build/src/ui_obconf.h" line="1041"/>
         <source>Window Titles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="859"/>
+        <location filename="../../build/src/ui_obconf.h" line="1042"/>
         <source>Button order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="900"/>
+        <location filename="../../build/src/ui_obconf.h" line="1083"/>
         <source>Moving and Resizing Windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="907"/>
+        <location filename="../../build/src/ui_obconf.h" line="1090"/>
         <source>Information Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="936"/>
+        <location filename="../../build/src/ui_obconf.h" line="1119"/>
         <source>Focusing Windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="937"/>
+        <location filename="../../build/src/ui_obconf.h" line="1120"/>
         <source>Focus windows when the mouse pointer moves over them</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="942"/>
+        <location filename="../../build/src/ui_obconf.h" line="1125"/>
         <source>Titlebar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="954"/>
+        <location filename="../../build/src/ui_obconf.h" line="1137"/>
         <source>Desktop Margins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="955"/>
+        <location filename="../../build/src/ui_obconf.h" line="1138"/>
         <source>Desktop margins are reserved areas on the edge of your screen.  New windows will not be placed within a margin, and maximized windows will not cover them.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="956"/>
+        <location filename="../../build/src/ui_obconf.h" line="1139"/>
         <source>Left:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="957"/>
-        <location filename="../../build/src/ui_obconf.h" line="959"/>
-        <location filename="../../build/src/ui_obconf.h" line="961"/>
-        <location filename="../../build/src/ui_obconf.h" line="963"/>
+        <location filename="../../build/src/ui_obconf.h" line="1140"/>
+        <location filename="../../build/src/ui_obconf.h" line="1142"/>
+        <location filename="../../build/src/ui_obconf.h" line="1144"/>
+        <location filename="../../build/src/ui_obconf.h" line="1146"/>
         <source>px</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="958"/>
+        <location filename="../../build/src/ui_obconf.h" line="1141"/>
         <source>Top:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="960"/>
+        <location filename="../../build/src/ui_obconf.h" line="1143"/>
         <source>Right:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="962"/>
+        <location filename="../../build/src/ui_obconf.h" line="1145"/>
         <source>Bottom:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="885"/>
+        <location filename="../../build/src/ui_obconf.h" line="1068"/>
         <source>All monitors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="886"/>
+        <location filename="../../build/src/ui_obconf.h" line="1069"/>
         <source>The active monitor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="887"/>
+        <location filename="../../build/src/ui_obconf.h" line="1070"/>
         <source>The monitor with the mouse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="890"/>
+        <location filename="../../build/src/ui_obconf.h" line="1073"/>
         <source>Primary Monitor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="891"/>
+        <location filename="../../build/src/ui_obconf.h" line="1074"/>
         <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="895"/>
+        <location filename="../../build/src/ui_obconf.h" line="1078"/>
         <source>Fixed Monitor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="896"/>
+        <location filename="../../build/src/ui_obconf.h" line="1079"/>
         <source>Active Monitor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="897"/>
+        <location filename="../../build/src/ui_obconf.h" line="1080"/>
         <source>Monitor With Mouse Pointer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="910"/>
-        <location filename="../../build/src/ui_obconf.h" line="917"/>
+        <location filename="../../build/src/ui_obconf.h" line="1093"/>
+        <location filename="../../build/src/ui_obconf.h" line="1100"/>
         <source>Centered</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="911"/>
+        <location filename="../../build/src/ui_obconf.h" line="1094"/>
         <source>From left edge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="912"/>
+        <location filename="../../build/src/ui_obconf.h" line="1095"/>
         <source>From right edge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="918"/>
+        <location filename="../../build/src/ui_obconf.h" line="1101"/>
         <source>From top edge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="919"/>
+        <location filename="../../build/src/ui_obconf.h" line="1102"/>
         <source>From bottom edge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="926"/>
+        <location filename="../../build/src/ui_obconf.h" line="1109"/>
         <source>When resizing terminal windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="927"/>
+        <location filename="../../build/src/ui_obconf.h" line="1110"/>
         <source>Always</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="928"/>
+        <location filename="../../build/src/ui_obconf.h" line="1111"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="932"/>
+        <location filename="../../build/src/ui_obconf.h" line="1115"/>
         <source>Centered on the window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="933"/>
+        <location filename="../../build/src/ui_obconf.h" line="1116"/>
         <source>Above the window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="934"/>
+        <location filename="../../build/src/ui_obconf.h" line="1117"/>
         <source>Fixed position on screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="946"/>
+        <location filename="../../build/src/ui_obconf.h" line="1129"/>
         <source>Maximizes the window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="947"/>
+        <location filename="../../build/src/ui_obconf.h" line="1130"/>
         <source>Shades the window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="860"/>
+        <location filename="../../build/src/ui_obconf.h" line="1043"/>
         <source>N: Window icon
 L: Window label (Title)
 I: Iconify (Minimize)
@@ -258,192 +258,322 @@ D: Omnipresent (On all desktops)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="888"/>
+        <location filename="../../build/src/ui_obconf.h" line="1071"/>
         <source>Primary monitor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="964"/>
+        <location filename="../../build/src/ui_obconf.h" line="1147"/>
+        <source>The dock is a special container for &quot;dockapps&quot;, or dock applications.  It is not visible on screen until a dockapp is run.  Dockapps can be used to show things like a clock, or to provide you with a system tray.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1148"/>
+        <source>Position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1149"/>
+        <source>&amp;Position:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1152"/>
+        <source>Top Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1153"/>
+        <source>Top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1154"/>
+        <source>Top Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1155"/>
+        <source>Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1156"/>
+        <source>Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1157"/>
+        <source>Bottom Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1158"/>
+        <source>Bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1159"/>
+        <source>Bottom Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1160"/>
+        <source>Floating</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1162"/>
+        <source>&amp;Floating position:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1163"/>
+        <source>x</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1164"/>
+        <source>Allow &amp;windows to be placed within the dock&apos;s area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1165"/>
+        <source>&amp;Orientation: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1168"/>
+        <source>Vertical</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1169"/>
+        <source>Horizontal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1171"/>
+        <source>Stacking</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1172"/>
+        <source>Keep dock &amp;above other windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1173"/>
+        <source>A&amp;llow dock to be both above and below windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1174"/>
+        <source>Keep dock &amp;below other windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1175"/>
+        <source>Hiding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1176"/>
+        <source>&amp;Delay before hiding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1177"/>
+        <source>Delay before &amp;showing:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1178"/>
+        <source>&amp;Hide off screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1179"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="853"/>
+        <location filename="../../build/src/ui_obconf.h" line="1036"/>
         <source>&amp;Install a new theme...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="854"/>
+        <location filename="../../build/src/ui_obconf.h" line="1037"/>
         <source>Create a theme &amp;archive (.obt)...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="856"/>
+        <location filename="../../build/src/ui_obconf.h" line="1039"/>
         <source>&amp;Windows retain a border when undecorated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="857"/>
+        <location filename="../../build/src/ui_obconf.h" line="1040"/>
         <source>A&amp;nimate iconify and restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="873"/>
+        <location filename="../../build/src/ui_obconf.h" line="1056"/>
         <source>&amp;Active window title: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="874"/>
+        <location filename="../../build/src/ui_obconf.h" line="1057"/>
         <source>&amp;Inactive window title: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="875"/>
+        <location filename="../../build/src/ui_obconf.h" line="1058"/>
         <source>Menu &amp;header: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="876"/>
+        <location filename="../../build/src/ui_obconf.h" line="1059"/>
         <source>&amp;Menu Item: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="877"/>
+        <location filename="../../build/src/ui_obconf.h" line="1060"/>
         <source>Active &amp;On-screen display: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="878"/>
+        <location filename="../../build/src/ui_obconf.h" line="1061"/>
         <source>Inactive O&amp;n-screen display: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="879"/>
+        <location filename="../../build/src/ui_obconf.h" line="1062"/>
         <source>Focus &amp;new windows when they appear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="880"/>
+        <location filename="../../build/src/ui_obconf.h" line="1063"/>
         <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"/>
+        <location filename="../../build/src/ui_obconf.h" line="1064"/>
         <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"/>
+        <location filename="../../build/src/ui_obconf.h" line="1065"/>
         <source>Prefer to place new windows &amp;on:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="892"/>
+        <location filename="../../build/src/ui_obconf.h" line="1075"/>
         <source>Primary &amp;monitor:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="899"/>
+        <location filename="../../build/src/ui_obconf.h" line="1082"/>
         <source>&amp;Fixed monitor:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="901"/>
+        <location filename="../../build/src/ui_obconf.h" line="1084"/>
         <source>Update the window contents while &amp;resizing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="902"/>
+        <location filename="../../build/src/ui_obconf.h" line="1085"/>
         <source>Drag &amp;threshold distance:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="903"/>
+        <location filename="../../build/src/ui_obconf.h" line="1086"/>
         <source>Amount of resistance against other &amp;windows:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="904"/>
+        <location filename="../../build/src/ui_obconf.h" line="1087"/>
         <source>Amount of resistance against screen &amp;edges:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="905"/>
+        <location filename="../../build/src/ui_obconf.h" line="1088"/>
         <source>&amp;Amount of time to wait before switching:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="906"/>
+        <location filename="../../build/src/ui_obconf.h" line="1089"/>
         <source>&amp;Switch desktops when moving a window past the screen edge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="914"/>
+        <location filename="../../build/src/ui_obconf.h" line="1097"/>
         <source>Fixed &amp;y position:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="921"/>
+        <location filename="../../build/src/ui_obconf.h" line="1104"/>
         <source>Information dialog&apos;s &amp;position:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="922"/>
+        <location filename="../../build/src/ui_obconf.h" line="1105"/>
         <source>Fixed &amp;x position:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="923"/>
+        <location filename="../../build/src/ui_obconf.h" line="1106"/>
         <source>Show &amp;information dialog:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="938"/>
+        <location filename="../../build/src/ui_obconf.h" line="1121"/>
         <source>&amp;Delay before focusing and raising windows:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="939"/>
+        <location filename="../../build/src/ui_obconf.h" line="1122"/>
         <source>Move focus under the mouse when &amp;switching desktops</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="940"/>
+        <location filename="../../build/src/ui_obconf.h" line="1123"/>
         <source>Move focus &amp;under the mouse when the mouse is not moving</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="941"/>
+        <location filename="../../build/src/ui_obconf.h" line="1124"/>
         <source>&amp;Raise windows when the mouse pointer moves over them</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="943"/>
+        <location filename="../../build/src/ui_obconf.h" line="1126"/>
         <source>Double click on the &amp;titlebar:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="949"/>
+        <location filename="../../build/src/ui_obconf.h" line="1132"/>
         <source>Double click ti&amp;me:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="950"/>
+        <location filename="../../build/src/ui_obconf.h" line="1133"/>
         <source>&amp;Show a notification when switching desktops</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="951"/>
+        <location filename="../../build/src/ui_obconf.h" line="1134"/>
         <source>&amp;Amount of time to show the notification for:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="952"/>
+        <location filename="../../build/src/ui_obconf.h" line="1135"/>
         <source>&amp;Number of desktops: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="953"/>
+        <location filename="../../build/src/ui_obconf.h" line="1136"/>
         <source>&amp;Desktop names:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -456,8 +586,9 @@ D: Omnipresent (On all desktops)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../desktops.cpp" line="152"/>
-        <location filename="../desktops.cpp" line="162"/>
+        <location filename="../desktops.cpp" line="65"/>
+        <location filename="../desktops.cpp" line="87"/>
+        <location filename="../desktops.cpp" line="99"/>
         <source>(Unnamed desktop)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -470,10 +601,12 @@ D: Omnipresent (On all desktops)</source>
         <location filename="../maindialog.cpp" line="77"/>
         <source>A preferences manager for Openbox
 
-Copyright (c) 2003-2013
+Copyright (c) 2014-2015
 
 Authors:
 * Hong Jen Yee (PCMan) &lt;pcman.tw@gmail.com&gt;
+
+The program is based on ObConf developed by the following developers.
 * Dana Jansens &lt;danakj@orodu.net&gt;
 * Tim Riley &lt;tr@slackzone.org&gt;
 * Javeed Shaikh &lt;syscrash2k@gmail.com&gt;</source>

src/translations/obconf-qt_de.desktop

@@ -0,0 +1,3 @@
+Name[de]=Fenstermanager Openbox
+GenericName[de]=Openbox Einstellungen
+Comment[de]=Konfiguration des Fenstermanagers Openbox (Qt-Version)

src/translations/obconf-qt_de.ts

@@ -0,0 +1,816 @@
+<?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>Fett</translation>
+    </message>
+    <message>
+        <location filename="../fontbutton.cpp" line="50"/>
+        <source>Italic</source>
+        <translation>Kursiv</translation>
+    </message>
+</context>
+<context>
+    <name>MainDialog</name>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1012"/>
+        <source>Window Manager Preferences</source>
+        <translation>Fenstermanager Openbox :: Einstellungen</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1017"/>
+        <source>Theme</source>
+        <translation>Thema</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1019"/>
+        <source>Appearance</source>
+        <translation>Erscheinungsbild</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1021"/>
+        <source>Font</source>
+        <translation>Schrift</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1023"/>
+        <location filename="../../build/src/ui_obconf.h" line="1038"/>
+        <source>Windows</source>
+        <translation>Fenster</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1025"/>
+        <source>Move &amp; Resize</source>
+        <translation>Verschieben und Größe ändern</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1027"/>
+        <source>Mouse</source>
+        <translation>Maus</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1029"/>
+        <source>Desktops</source>
+        <translation>Arbeitsflächen</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1031"/>
+        <source>Margins</source>
+        <translation>Ränder</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1033"/>
+        <source>Dock</source>
+        <translation>Dock</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1036"/>
+        <source>&amp;Install a new theme...</source>
+        <translation>Neues Thema &amp;installieren...</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1037"/>
+        <source>Create a theme &amp;archive (.obt)...</source>
+        <translation>Themenarchiv &amp;erstellen (.obt)...</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1039"/>
+        <source>&amp;Windows retain a border when undecorated</source>
+        <translation>Undekorierte Fenster um&amp;randen</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1040"/>
+        <source>A&amp;nimate iconify and restore</source>
+        <translation>Minimieren und Wiederherstellen &amp;animieren</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1041"/>
+        <source>Window Titles</source>
+        <translation>Fenstertitel</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1042"/>
+        <source>Button order:</source>
+        <translation>Anordnung der Schaltflächen (Knöpfe):</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1043"/>
+        <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>N: Fenstersymbol
+L: Fenstertitel
+I: Minimieren
+M: Maximieren
+C: Schließen
+S: Einrollen
+D: auf allen Arbeitsflächen</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1056"/>
+        <source>&amp;Active window title: </source>
+        <translation>Fenstertitel &amp;aktives Fenster</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1057"/>
+        <source>&amp;Inactive window title: </source>
+        <translation>Fenstertitel &amp;inaktives Fenster</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1058"/>
+        <source>Menu &amp;header: </source>
+        <translation>Menü - &amp;Überschrift</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1059"/>
+        <source>&amp;Menu Item: </source>
+        <translation>Menü - einzelne &amp;Einträge</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1060"/>
+        <source>Active &amp;On-screen display: </source>
+        <translation>A&amp;ktive Bildschirmanzeige</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1061"/>
+        <source>Inactive O&amp;n-screen display: </source>
+        <translation>I&amp;naktive Bildschirmanzeige</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1062"/>
+        <source>Focus &amp;new windows when they appear</source>
+        <translation>&amp;Neue Fenster beim Erscheinen fokussieren</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1063"/>
+        <source>&amp;Place new windows under the mouse pointer</source>
+        <translation>Neue Fenster unter dem Mauszeiger &amp;platzieren</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1064"/>
+        <source>&amp;Center new windows when they are placed</source>
+        <translation>Neue Fenster &amp;zentrieren</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1065"/>
+        <source>Prefer to place new windows &amp;on:</source>
+        <translation>Neue Fenster &amp;vorzugsweise platzieren auf</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1068"/>
+        <source>All monitors</source>
+        <translation>allen Bildschirmen</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1069"/>
+        <source>The active monitor</source>
+        <translation>dem aktiven Bildschirm</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1070"/>
+        <source>The monitor with the mouse</source>
+        <translation>dem Bildschirm, wo sich der Mauszeiger befindet</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1071"/>
+        <source>Primary monitor</source>
+        <translation>dem primären Bildschirm</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1073"/>
+        <source>Primary Monitor</source>
+        <translation>Primärer Bildschirm</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1074"/>
+        <source>The primary monitor is where Openbox will place dialogs, such as the one used for cycling windows.</source>
+        <translation>Der primäre Bildschirm ist derjenige, auf dem Dialoge wie der zum Wechsel von Fenstern angezeigt werden.</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1075"/>
+        <source>Primary &amp;monitor:</source>
+        <translation>P&amp;rimärer Bildschirm</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1078"/>
+        <source>Fixed Monitor</source>
+        <translation>Festgelegter Bildschirm</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1079"/>
+        <source>Active Monitor</source>
+        <translation>aktiver Bildschirm</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1080"/>
+        <source>Monitor With Mouse Pointer</source>
+        <translation>Bildschirm, wo sich der Mauszeiger befindet</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1082"/>
+        <source>&amp;Fixed monitor:</source>
+        <translation>&amp;Festgelegter Bildschirm</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1083"/>
+        <source>Moving and Resizing Windows</source>
+        <translation>Verschieben und Größenänderung von Fenstern</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1084"/>
+        <source>Update the window contents while &amp;resizing</source>
+        <translation>Fensterinhalt während &amp;Größenänderungen anzeigen</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1085"/>
+        <source>Drag &amp;threshold distance:</source>
+        <translation>Abstand beim &amp;Verschieben</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1086"/>
+        <source>Amount of resistance against other &amp;windows:</source>
+        <translation>Widerstand gegenüber anderen &amp;Fenstern</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1087"/>
+        <source>Amount of resistance against screen &amp;edges:</source>
+        <translation>Widerstand gegenüber &amp;Bildschirmrändern</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1088"/>
+        <source>&amp;Amount of time to wait before switching:</source>
+        <translation>Ver&amp;zögerung vor dem Arbeitsflächenwechsel</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1089"/>
+        <source>&amp;Switch desktops when moving a window past the screen edge</source>
+        <translation>Arbeitsfläche beim Verschieben des Fensters über ihren Rand &amp;wechseln</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1090"/>
+        <source>Information Dialog</source>
+        <translation>Informationsdialog</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1093"/>
+        <location filename="../../build/src/ui_obconf.h" line="1100"/>
+        <source>Centered</source>
+        <translation>Fenstermitte</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1094"/>
+        <source>From left edge</source>
+        <translation>Vom linken Rand</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1095"/>
+        <source>From right edge</source>
+        <translation>Vom rechten Rand</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1097"/>
+        <source>Fixed &amp;y position:</source>
+        <translation>Festgelegte &amp;y-Position (Pixel)</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1101"/>
+        <source>From top edge</source>
+        <translation>Vom oberen Rand</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1102"/>
+        <source>From bottom edge</source>
+        <translation>Vom unteren Rand</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1104"/>
+        <source>Information dialog&apos;s &amp;position:</source>
+        <translation>&amp;Position des Informationsdialogs</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1105"/>
+        <source>Fixed &amp;x position:</source>
+        <translation>Festgelegte &amp;x-Position (Pixel)</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1106"/>
+        <source>Show &amp;information dialog:</source>
+        <translation>&amp;Informationsdialog anzeigen:</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1109"/>
+        <source>When resizing terminal windows</source>
+        <translation>Bei Größenänderung von Terminalfenstern</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1110"/>
+        <source>Always</source>
+        <translation>Immer</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1111"/>
+        <source>Never</source>
+        <translation>Nie</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1115"/>
+        <source>Centered on the window</source>
+        <translation>Fenstermitte</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1116"/>
+        <source>Above the window</source>
+        <translation>Oberhalb des Fensters</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1117"/>
+        <source>Fixed position on screen</source>
+        <translation>Feste Position auf dem Bildschirm</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1119"/>
+        <source>Focusing Windows</source>
+        <translation>Fokussieren von Fenstern</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1120"/>
+        <source>Focus windows when the mouse pointer moves over them</source>
+        <translation>Fenster &amp;fokussieren, wenn sich der Mauszeiger über ihnen befindet</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1121"/>
+        <source>&amp;Delay before focusing and raising windows:</source>
+        <translation>&amp;Verzögerung vor dem Fokussieren und Hervorheben</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1122"/>
+        <source>Move focus under the mouse when &amp;switching desktops</source>
+        <translation>Beim &amp;Wechsel von Arbeitsflächen Fokus unter den Mauszeiger bringen</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1123"/>
+        <source>Move focus &amp;under the mouse when the mouse is not moving</source>
+        <translation>Fokus &amp;unter die Maus bringen, wenn diese nicht bewegt wird</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1124"/>
+        <source>&amp;Raise windows when the mouse pointer moves over them</source>
+        <translation>Fenster &amp;hervorheben, wenn sich der Mauszeiger darüber befindet</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1125"/>
+        <source>Titlebar</source>
+        <translation>Fenstertitel</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1126"/>
+        <source>Double click on the &amp;titlebar:</source>
+        <translation>Doppelklick auf den Fenster&amp;titel</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1129"/>
+        <source>Maximizes the window</source>
+        <translation>Maximiert das Fenster</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1130"/>
+        <source>Shades the window</source>
+        <translation>Rollt das Fenster ein</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1132"/>
+        <source>Double click ti&amp;me:</source>
+        <translation>&amp;Intervall für Doppelklick</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1133"/>
+        <source>&amp;Show a notification when switching desktops</source>
+        <translation>Benachrichtigung beim Arbeitsflächen&amp;wechsel anzeigen</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1134"/>
+        <source>&amp;Amount of time to show the notification for:</source>
+        <translation>&amp;Dauer, für die die Benachrichtigung angezeigt wird</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1135"/>
+        <source>&amp;Number of desktops: </source>
+        <translation>An&amp;zahl an Arbeitsflächen</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1136"/>
+        <source>&amp;Desktop names:</source>
+        <translation>&amp;Bezeichnungen der Arbeitsflächen</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1137"/>
+        <source>Desktop Margins</source>
+        <translation>Arbeitsflächenränder</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1138"/>
+        <source>Desktop margins are reserved areas on the edge of your screen.  New windows will not be placed within a margin, and maximized windows will not cover them.</source>
+        <translation>Arbeitsflächenränder sind reservierte Bereiche am Rand des Bildschirms. Neue Fenster werden dort nicht platziert und maximierte Fenster überdecken diese Bereiche nicht.</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1139"/>
+        <source>Left:</source>
+        <translation>Links</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1140"/>
+        <location filename="../../build/src/ui_obconf.h" line="1142"/>
+        <location filename="../../build/src/ui_obconf.h" line="1144"/>
+        <location filename="../../build/src/ui_obconf.h" line="1146"/>
+        <source>px</source>
+        <translation>Pixel (px)</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1141"/>
+        <source>Top:</source>
+        <translation>Oben</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1143"/>
+        <source>Right:</source>
+        <translation>Rechts</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1145"/>
+        <source>Bottom:</source>
+        <translation>Unten</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1147"/>
+        <source>The dock is a special container for &quot;dockapps&quot;, or dock applications.  It is not visible on screen until a dockapp is run.  Dockapps can be used to show things like a clock, or to provide you with a system tray.</source>
+        <translation>Das "dock" ist ein graphisches Objekt zum Vorhalten sogenannter dock-Anwendungen ("dockapps"), die z. B. eine Uhr oder Benachrichtigungen anzeigen können.
+Das dock wird erst nach dem Starten von dockapps sichtbar.</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1148"/>
+        <source>Position</source>
+        <translation>Position</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1149"/>
+        <source>&amp;Position:</source>
+        <translation>&amp;Position:</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1152"/>
+        <source>Top Left</source>
+        <translation>oben links</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1153"/>
+        <source>Top</source>
+        <translation>oben zentriert</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1154"/>
+        <source>Top Right</source>
+        <translation>oben rechts</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1155"/>
+        <source>Left</source>
+        <translation>mitte (vertikal) links</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1156"/>
+        <source>Right</source>
+        <translation>mitte (vertikal) rechts</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1157"/>
+        <source>Bottom Left</source>
+        <translation>unten rechts</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1158"/>
+        <source>Bottom</source>
+        <translation>unten zentriert</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1159"/>
+        <source>Bottom Right</source>
+        <translation>unten rechts</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1160"/>
+        <source>Floating</source>
+        <translation>manuell festgelegte Position</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1162"/>
+        <source>&amp;Floating position:</source>
+        <translation>&amp;manuell festgelegte Position</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1163"/>
+        <source>x</source>
+        <translation>x</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1164"/>
+        <source>Allow &amp;windows to be placed within the dock&apos;s area</source>
+        <translation>Positionieren von &amp;Fenstern über dem dock erlauben</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1165"/>
+        <source>&amp;Orientation: </source>
+        <translation>Ausrichtung</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1168"/>
+        <source>Vertical</source>
+        <translation>vertikal</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1169"/>
+        <source>Horizontal</source>
+        <translation>horizontal</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1171"/>
+        <source>Stacking</source>
+        <translation>Ebenen</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1172"/>
+        <source>Keep dock &amp;above other windows</source>
+        <translation>immer im &amp;Vordergrund</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1173"/>
+        <source>A&amp;llow dock to be both above and below windows</source>
+        <translation>analog &amp;regulären Fenstern (Vorder- und Hintergrund möglich)</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1174"/>
+        <source>Keep dock &amp;below other windows</source>
+        <translation>immer im &amp;Hintergrund</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1175"/>
+        <source>Hiding</source>
+        <translation>Ausblenden</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1176"/>
+        <source>&amp;Delay before hiding:</source>
+        <translation>Verzögerung vor dem &amp;Ausblenden</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1177"/>
+        <source>Delay before &amp;showing:</source>
+        <translation>Verzögerung vor dem &amp;Einblenden</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1178"/>
+        <source>&amp;Hide off screen</source>
+        <translation>Ausblenden a&amp;ktivieren</translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1179"/>
+        <source>About</source>
+        <translation>&amp;Über ObConf-Qt</translation>
+    </message>
+</context>
+<context>
+    <name>Obconf::MainDialog</name>
+    <message>
+        <location filename="../theme.cpp" line="150"/>
+        <location filename="../theme.cpp" line="160"/>
+        <source>Choose an Openbox theme</source>
+        <translation>Auswahl des Openbox Themas</translation>
+    </message>
+    <message>
+        <location filename="../desktops.cpp" line="65"/>
+        <location filename="../desktops.cpp" line="87"/>
+        <location filename="../desktops.cpp" line="99"/>
+        <source>(Unnamed desktop)</source>
+        <translation>(Unbenannte Arbeitsfläche)</translation>
+    </message>
+    <message>
+        <location filename="../mouse.cpp" line="57"/>
+        <source>Custom actions</source>
+        <translation>Benutzerdefinierte Aktionen</translation>
+    </message>
+    <message>
+        <location filename="../maindialog.cpp" line="76"/>
+        <source>About ObConf-Qt</source>
+        <translation>Über ObConf-Qt</translation>
+    </message>
+    <message>
+        <location filename="../maindialog.cpp" line="77"/>
+        <source>A preferences manager for Openbox
+
+Copyright (c) 2014-2015
+
+Authors:
+* Hong Jen Yee (PCMan) &lt;pcman.tw@gmail.com&gt;
+
+The program is based on ObConf developed by the following developers.
+* Dana Jansens &lt;danakj@orodu.net&gt;
+* Tim Riley &lt;tr@slackzone.org&gt;
+* Javeed Shaikh &lt;syscrash2k@gmail.com&gt;</source>
+        <translation>graphische Benutzeroberfläche zur Konfiguration des Fenstermanagers Openbox
+
+Copyright (c) 2014-2015
+
+Autor:
+* Hong Jen Yee (PCMan) &lt;pcman.tw@gmail.com&gt;
+
+Das Programm basiert auf ObConf, entwickelt von
+* Dana Jansens &lt;danakj@orodu.net&gt;
+* Tim Riley &lt;tr@slackzone.org&gt;
+* Javeed Shaikh &lt;syscrash2k@gmail.com&gt;</translation>
+    </message>
+    <message>
+        <source>A preferences manager for Openbox
+
+Copyright (c) 2003-2013
+
+Authors:
+* Hong Jen Yee (PCMan) &lt;pcman.tw@gmail.com&gt;
+* Dana Jansens &lt;danakj@orodu.net&gt;
+* Tim Riley &lt;tr@slackzone.org&gt;
+* Javeed Shaikh &lt;syscrash2k@gmail.com&gt;</source>
+        <translation type="vanished">graphische Benutzeroberfläche zur Konfiguration des Fenstermanagers Openbox
+
+Copyright (c) 2003-2013
+
+Autoren:
+* Hong Jen Yee (PCMan) &lt;pcman.tw@gmail.com&gt;
+* Dana Jansens &lt;danakj@orodu.net&gt;
+* Tim Riley &lt;tr@slackzone.org&gt;
+* Javeed Shaikh &lt;syscrash2k@gmail.com&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <location filename="../archive.cpp" line="26"/>
+        <source>&quot;%1&quot; was installed to %1</source>
+        <translation>&quot;%1&quot; wurde nach %1 installiert</translation>
+    </message>
+    <message>
+        <location filename="../archive.cpp" line="53"/>
+        <source>&quot;%1&quot; was successfully created</source>
+        <translation>&quot;%1&quot; wurde erfolgreich erstellt</translation>
+    </message>
+    <message>
+        <location filename="../archive.cpp" line="89"/>
+        <source>Unable to create the theme archive &quot;%1&quot;.
+The following errors were reported:
+%2</source>
+        <translation>Erstellung des Themenarchivs &quot;%1&quot; ist fehlgeschlagen.
+        Die folgenden Fehlermeldungen wurden mitgeteilt:
+        %2</translation>
+    </message>
+    <message>
+        <location filename="../archive.cpp" line="95"/>
+        <location filename="../archive.cpp" line="178"/>
+        <source>Unable to run the &quot;tar&quot; command: %1</source>
+        <translation>&quot;tar&quot; Befehl %1 kann nicht ausgeführt werden</translation>
+    </message>
+    <message>
+        <location filename="../archive.cpp" line="115"/>
+        <source>Unable to create directory &quot;%1&quot;: %2</source>
+        <translation>Verzeichnis &quot;%1&quot; kann nicht erstellt werden: %2</translation>
+    </message>
+    <message>
+        <location filename="../archive.cpp" line="138"/>
+        <source>&quot;%1&quot; does not appear to be a valid Openbox theme directory</source>
+        <translation>&quot;%1&quot; scheint kein korrektes Themenverzeichnis von Openbox zu sein</translation>
+    </message>
+    <message>
+        <location filename="../archive.cpp" line="148"/>
+        <source>Unable to move to directory &quot;%1&quot;: %2</source>
+        <translation>Verzeichnis &quot;%1&quot; kann nicht verschoben werden: %2</translation>
+    </message>
+    <message>
+        <location filename="../archive.cpp" line="185"/>
+        <source>Unable to extract the file &quot;%1&quot;.
+Please ensure that &quot;%2&quot; is writable and that the file is a valid Openbox theme archive.
+The following errors were reported:
+%3</source>
+        <translation>Datei &quot;%1&quot; kann nicht entpackt werden.
+        Bitte sicherstellen, dass &quot;%2&quot; beschrieben werden kann und die Datei ein korrektes Archiv mit einem Openbox Thema ist.
+        Folgende Fehlermeldungen wurden mitgeteilt:
+        %3</translation>
+    </message>
+    <message>
+        <location filename="../obconf-qt.cpp" line="53"/>
+        <source>ObConf Error</source>
+        <translation>ObConf-Qt Fehler</translation>
+    </message>
+    <message>
+        <location filename="../obconf-qt.cpp" line="58"/>
+        <source>Copyright (c) 2003-2008   Dana Jansens
+Copyright (c) 2003        Tim Riley
+Copyright (c) 2007        Javeed Shaikh
+Copyright (c) 2013        Hong Jen Yee (PCMan)
+
+This program comes with ABSOLUTELY NO WARRANTY.
+This is free software, and you are welcome to redistribute it
+under certain conditions. See the file COPYING for details.
+
+</source>
+        <translation>Copyright (c) 2003-2008   Dana Jansens
+Copyright (c) 2003        Tim Riley
+Copyright (c) 2007        Javeed Shaikh
+Copyright (c) 2013        Hong Jen Yee (PCMan)
+
+Dieses Programm wird unter Ausschluss jeglicher Garantie zur Verfügung
+gestellt.
+Es handelt sich um freie Software,die unter Beachtung bestimmter
+Voraussetzungen gerne weitergegeben werden darf, Näheres enthält die
+Datei COPYING.
+
+</translation>
+    </message>
+    <message>
+        <location filename="../obconf-qt.cpp" line="73"/>
+        <source>Syntax: obconf [options] [ARCHIVE.obt]
+
+Options:
+  --help                Display this help and exit
+  --version             Display the version and exit
+  --install ARCHIVE.obt Install the given theme archive and select it
+  --archive THEME       Create a theme archive from the given theme directory
+  --config-file FILE    Specify the path to the config file to use
+</source>
+        <translation>Übersicht: obconf [Optionen] [ARCHIVE.obt]
+
+Optionen:
+  --help                diesen Hilfetext ausgeben und Programm beenden
+  --version             Version ausgeben und Programm beenden
+  --install ARCHIVE.obt Thema aus angegebenem Archiv extrahieren und verwenden
+  --archive THEMA       Archiv mit dem im genannten Verzeichnis befindlichen Thema erstellen
+  --config-file DATEI   zu verwendende Konfigurationsdatei explizit angeben
+  </translation>
+    </message>
+    <message>
+        <location filename="../obconf-qt.cpp" line="97"/>
+        <source>--install requires an argument
+</source>
+        <translation>--install benötigt ein Argument</translation>
+    </message>
+    <message>
+        <location filename="../obconf-qt.cpp" line="103"/>
+        <source>--archive requires an argument
+</source>
+        <translation>--archive benötigt ein Argument</translation>
+    </message>
+    <message>
+        <location filename="../obconf-qt.cpp" line="109"/>
+        <source>--config-file requires an argument
+</source>
+        <translation>--config-file benötigt ein Argument</translation>
+    </message>
+    <message>
+        <location filename="../obconf-qt.cpp" line="235"/>
+        <source>Error while parsing the Openbox configuration file.  Your configuration file is not valid XML.
+
+Message: %1</source>
+        <translation>Fehler bei der Auswertung der Konfigurationsdatei von Openbox. Die Konfigurationsdatei ist nicht in korrekter XML verfasst.</translation>
+    </message>
+    <message>
+        <source>--archive requires an argument</source>
+        <translation type="vanished">--archive benötigt ein Argument</translation>
+    </message>
+    <message>
+        <source>--config-file requires an argument</source>
+        <translation type="vanished">--config-file benötigt ein Argument</translation>
+    </message>
+    <message>
+        <location filename="../obconf-qt.cpp" line="221"/>
+        <location filename="../obconf-qt.cpp" line="237"/>
+        <source>Error</source>
+        <translation>Fehler</translation>
+    </message>
+    <message>
+        <location filename="../obconf-qt.cpp" line="222"/>
+        <source>Failed to load an rc.xml. You have probably failed to install Openbox properly.</source>
+        <translation>Datei rc.xml konnte nicht geladen werden. Möglicher Weise wurde Openbox nicht korrekt installiert.</translation>
+    </message>
+    <message>
+        <source>Error while parsing the Openbox configuration file.  Your configuration file is not valid XML.
+
+        Message: %1</source>
+        <translation type="vanished">Fehler bei der Verarbeitung der Konfigurationsdatei von Openbox. Die genannte Datei ist kein korrektes XML.
+        
+        Fehlermeldung: %1</translation>
+    </message>
+</context>
+</TS>

src/translations/obconf-qt_es.ts

@@ -17,237 +17,237 @@
 <context>
     <name>MainDialog</name>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="844"/>
+        <location filename="../../build/src/ui_obconf.h" line="1027"/>
         <source>Mouse</source>
         <translation>Ratón</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="829"/>
+        <location filename="../../build/src/ui_obconf.h" line="1012"/>
         <source>Window Manager Preferences</source>
         <translation>Preferencias del gestor de ventanas</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="834"/>
+        <location filename="../../build/src/ui_obconf.h" line="1017"/>
         <source>Theme</source>
         <translation>Tema</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="836"/>
+        <location filename="../../build/src/ui_obconf.h" line="1019"/>
         <source>Appearance</source>
         <translation>Apariencia</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="838"/>
+        <location filename="../../build/src/ui_obconf.h" line="1021"/>
         <source>Font</source>
         <translation>Tipo de letra</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="840"/>
-        <location filename="../../build/src/ui_obconf.h" line="855"/>
+        <location filename="../../build/src/ui_obconf.h" line="1023"/>
+        <location filename="../../build/src/ui_obconf.h" line="1038"/>
         <source>Windows</source>
         <translation>Ventanas</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="842"/>
+        <location filename="../../build/src/ui_obconf.h" line="1025"/>
         <source>Move &amp; Resize</source>
         <translation>Mover y redimensionar</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="846"/>
+        <location filename="../../build/src/ui_obconf.h" line="1029"/>
         <source>Desktops</source>
         <translation>Escritorios</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="848"/>
+        <location filename="../../build/src/ui_obconf.h" line="1031"/>
         <source>Margins</source>
         <translation>Márgenes</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="850"/>
+        <location filename="../../build/src/ui_obconf.h" line="1033"/>
         <source>Dock</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="858"/>
+        <location filename="../../build/src/ui_obconf.h" line="1041"/>
         <source>Window Titles</source>
         <translation>Títulos de las ventanas</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="859"/>
+        <location filename="../../build/src/ui_obconf.h" line="1042"/>
         <source>Button order:</source>
         <translation>Orden de los botones:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="900"/>
+        <location filename="../../build/src/ui_obconf.h" line="1083"/>
         <source>Moving and Resizing Windows</source>
         <translation>Mover y redimensionar ventanas</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="907"/>
+        <location filename="../../build/src/ui_obconf.h" line="1090"/>
         <source>Information Dialog</source>
         <translation>Diálogo de información</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="936"/>
+        <location filename="../../build/src/ui_obconf.h" line="1119"/>
         <source>Focusing Windows</source>
         <translation>Enfocar ventanas</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="937"/>
+        <location filename="../../build/src/ui_obconf.h" line="1120"/>
         <source>Focus windows when the mouse pointer moves over them</source>
         <translation>Enfocar las ventanas al pasar el ratón sobre ellas</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="942"/>
+        <location filename="../../build/src/ui_obconf.h" line="1125"/>
         <source>Titlebar</source>
         <translation>Barra de título</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="954"/>
+        <location filename="../../build/src/ui_obconf.h" line="1137"/>
         <source>Desktop Margins</source>
         <translation>Márgenes del escritorio</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="955"/>
+        <location filename="../../build/src/ui_obconf.h" line="1138"/>
         <source>Desktop margins are reserved areas on the edge of your screen.  New windows will not be placed within a margin, and maximized windows will not cover them.</source>
         <translation>Los márgenes del escritorio son áreas reservadas en los bordes de la pantalla. Las ventanas nuevas no los ocuparán y las ventanas maximizadas no los cubrirán.</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="956"/>
+        <location filename="../../build/src/ui_obconf.h" line="1139"/>
         <source>Left:</source>
         <translation>Izquierdo:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="957"/>
-        <location filename="../../build/src/ui_obconf.h" line="959"/>
-        <location filename="../../build/src/ui_obconf.h" line="961"/>
-        <location filename="../../build/src/ui_obconf.h" line="963"/>
+        <location filename="../../build/src/ui_obconf.h" line="1140"/>
+        <location filename="../../build/src/ui_obconf.h" line="1142"/>
+        <location filename="../../build/src/ui_obconf.h" line="1144"/>
+        <location filename="../../build/src/ui_obconf.h" line="1146"/>
         <source>px</source>
         <translation>px</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="958"/>
+        <location filename="../../build/src/ui_obconf.h" line="1141"/>
         <source>Top:</source>
         <translation>Superior:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="960"/>
+        <location filename="../../build/src/ui_obconf.h" line="1143"/>
         <source>Right:</source>
         <translation>Derecho:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="962"/>
+        <location filename="../../build/src/ui_obconf.h" line="1145"/>
         <source>Bottom:</source>
         <translation>Inferior:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="885"/>
+        <location filename="../../build/src/ui_obconf.h" line="1068"/>
         <source>All monitors</source>
         <translation>Todos los monitores</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="886"/>
+        <location filename="../../build/src/ui_obconf.h" line="1069"/>
         <source>The active monitor</source>
         <translation>El monitor activo</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="887"/>
+        <location filename="../../build/src/ui_obconf.h" line="1070"/>
         <source>The monitor with the mouse</source>
         <translation>El monitor que contiene el ratón</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="890"/>
+        <location filename="../../build/src/ui_obconf.h" line="1073"/>
         <source>Primary Monitor</source>
         <translation>Monitor primario</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="891"/>
+        <location filename="../../build/src/ui_obconf.h" line="1074"/>
         <source>The primary monitor is where Openbox will place dialogs, such as the one used for cycling windows.</source>
         <translation>El monitor primario es donde Openbox ubicará los diálogos, como el usado para alternar las ventanas.</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="895"/>
+        <location filename="../../build/src/ui_obconf.h" line="1078"/>
         <source>Fixed Monitor</source>
         <translation>Monitor fijo</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="896"/>
+        <location filename="../../build/src/ui_obconf.h" line="1079"/>
         <source>Active Monitor</source>
         <translation>Monitor activo</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="897"/>
+        <location filename="../../build/src/ui_obconf.h" line="1080"/>
         <source>Monitor With Mouse Pointer</source>
         <translation>Monitor con el puntero del ratón</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="910"/>
-        <location filename="../../build/src/ui_obconf.h" line="917"/>
+        <location filename="../../build/src/ui_obconf.h" line="1093"/>
+        <location filename="../../build/src/ui_obconf.h" line="1100"/>
         <source>Centered</source>
         <translation>Centrado</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="911"/>
+        <location filename="../../build/src/ui_obconf.h" line="1094"/>
         <source>From left edge</source>
         <translation>Desde el borde izquierdo</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="912"/>
+        <location filename="../../build/src/ui_obconf.h" line="1095"/>
         <source>From right edge</source>
         <translation>Desde el borde derecho</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="918"/>
+        <location filename="../../build/src/ui_obconf.h" line="1101"/>
         <source>From top edge</source>
         <translation>Desde el borde superior</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="919"/>
+        <location filename="../../build/src/ui_obconf.h" line="1102"/>
         <source>From bottom edge</source>
         <translation>Desde el borde inferior</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="926"/>
+        <location filename="../../build/src/ui_obconf.h" line="1109"/>
         <source>When resizing terminal windows</source>
         <translation>Al redimensionar ventanas de terminal</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="927"/>
+        <location filename="../../build/src/ui_obconf.h" line="1110"/>
         <source>Always</source>
         <translation>Siempre</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="928"/>
+        <location filename="../../build/src/ui_obconf.h" line="1111"/>
         <source>Never</source>
         <translation>Nunca</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="932"/>
+        <location filename="../../build/src/ui_obconf.h" line="1115"/>
         <source>Centered on the window</source>
         <translation>Centrado en la ventana</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="933"/>
+        <location filename="../../build/src/ui_obconf.h" line="1116"/>
         <source>Above the window</source>
         <translation>Encima de la ventana</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="934"/>
+        <location filename="../../build/src/ui_obconf.h" line="1117"/>
         <source>Fixed position on screen</source>
         <translation>Posición fija en la pantalla</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="946"/>
+        <location filename="../../build/src/ui_obconf.h" line="1129"/>
         <source>Maximizes the window</source>
         <translation>Maximiza la ventana</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="947"/>
+        <location filename="../../build/src/ui_obconf.h" line="1130"/>
         <source>Shades the window</source>
         <translation>Enrolla la ventana</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="860"/>
+        <location filename="../../build/src/ui_obconf.h" line="1043"/>
         <source>N: Window icon
 L: Window label (Title)
 I: Iconify (Minimize)
@@ -264,192 +264,322 @@ S: Enrollar
 D: Omnipresente (en todos los escritorios)</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="888"/>
+        <location filename="../../build/src/ui_obconf.h" line="1071"/>
         <source>Primary monitor</source>
         <translation>Monitor primario</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="964"/>
+        <location filename="../../build/src/ui_obconf.h" line="1147"/>
+        <source>The dock is a special container for &quot;dockapps&quot;, or dock applications.  It is not visible on screen until a dockapp is run.  Dockapps can be used to show things like a clock, or to provide you with a system tray.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1148"/>
+        <source>Position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1149"/>
+        <source>&amp;Position:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1152"/>
+        <source>Top Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1153"/>
+        <source>Top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1154"/>
+        <source>Top Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1155"/>
+        <source>Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1156"/>
+        <source>Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1157"/>
+        <source>Bottom Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1158"/>
+        <source>Bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1159"/>
+        <source>Bottom Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1160"/>
+        <source>Floating</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1162"/>
+        <source>&amp;Floating position:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1163"/>
+        <source>x</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1164"/>
+        <source>Allow &amp;windows to be placed within the dock&apos;s area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1165"/>
+        <source>&amp;Orientation: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1168"/>
+        <source>Vertical</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1169"/>
+        <source>Horizontal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1171"/>
+        <source>Stacking</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1172"/>
+        <source>Keep dock &amp;above other windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1173"/>
+        <source>A&amp;llow dock to be both above and below windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1174"/>
+        <source>Keep dock &amp;below other windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1175"/>
+        <source>Hiding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1176"/>
+        <source>&amp;Delay before hiding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1177"/>
+        <source>Delay before &amp;showing:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1178"/>
+        <source>&amp;Hide off screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1179"/>
         <source>About</source>
         <translation>Acerca de</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="853"/>
+        <location filename="../../build/src/ui_obconf.h" line="1036"/>
         <source>&amp;Install a new theme...</source>
         <translation>&amp;Instalar un tema nuevo…</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="854"/>
+        <location filename="../../build/src/ui_obconf.h" line="1037"/>
         <source>Create a theme &amp;archive (.obt)...</source>
         <translation>Crear &amp;archivador de tema (.obt)…</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="856"/>
+        <location filename="../../build/src/ui_obconf.h" line="1039"/>
         <source>&amp;Windows retain a border when undecorated</source>
         <translation>Las &amp;ventanas conservan un borde cuando no hay decoración</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="857"/>
+        <location filename="../../build/src/ui_obconf.h" line="1040"/>
         <source>A&amp;nimate iconify and restore</source>
         <translation>A&amp;nimación al minimizar y restaurar</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="873"/>
+        <location filename="../../build/src/ui_obconf.h" line="1056"/>
         <source>&amp;Active window title: </source>
         <translation>Título de ventana &amp;activa: </translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="874"/>
+        <location filename="../../build/src/ui_obconf.h" line="1057"/>
         <source>&amp;Inactive window title: </source>
         <translation>Título de ventana &amp;inactiva: </translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="875"/>
+        <location filename="../../build/src/ui_obconf.h" line="1058"/>
         <source>Menu &amp;header: </source>
         <translation>Encabe&amp;zamiento del menú: </translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="876"/>
+        <location filename="../../build/src/ui_obconf.h" line="1059"/>
         <source>&amp;Menu Item: </source>
         <translation>Elemento del &amp;menú: </translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="877"/>
+        <location filename="../../build/src/ui_obconf.h" line="1060"/>
         <source>Active &amp;On-screen display: </source>
         <translation>Visualización en &amp;pantalla activa: </translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="878"/>
+        <location filename="../../build/src/ui_obconf.h" line="1061"/>
         <source>Inactive O&amp;n-screen display: </source>
         <translation>Visualización en pa&amp;ntalla inactiva: </translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="879"/>
+        <location filename="../../build/src/ui_obconf.h" line="1062"/>
         <source>Focus &amp;new windows when they appear</source>
         <translation>Enfocar las ventanas &amp;nuevas cuando aparecen</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="880"/>
+        <location filename="../../build/src/ui_obconf.h" line="1063"/>
         <source>&amp;Place new windows under the mouse pointer</source>
         <translation>&amp;Ubicar las ventanas nuevas bajo el puntero del ratón</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="881"/>
+        <location filename="../../build/src/ui_obconf.h" line="1064"/>
         <source>&amp;Center new windows when they are placed</source>
         <translation>&amp;Centrar las ventanas nuevas al ubicarlas</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="882"/>
+        <location filename="../../build/src/ui_obconf.h" line="1065"/>
         <source>Prefer to place new windows &amp;on:</source>
         <translation>&amp;Ubicar las ventanas nuevas en:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="892"/>
+        <location filename="../../build/src/ui_obconf.h" line="1075"/>
         <source>Primary &amp;monitor:</source>
         <translation>&amp;Monitor primario:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="899"/>
+        <location filename="../../build/src/ui_obconf.h" line="1082"/>
         <source>&amp;Fixed monitor:</source>
         <translation>Monitor &amp;fijo:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="901"/>
+        <location filename="../../build/src/ui_obconf.h" line="1084"/>
         <source>Update the window contents while &amp;resizing</source>
         <translation>Actualizar contenido de la ventana al &amp;redimensionarla</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="902"/>
+        <location filename="../../build/src/ui_obconf.h" line="1085"/>
         <source>Drag &amp;threshold distance:</source>
         <translation>&amp;Umbral de distancia del arrastre:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="903"/>
+        <location filename="../../build/src/ui_obconf.h" line="1086"/>
         <source>Amount of resistance against other &amp;windows:</source>
         <translation>Cantidad de resistencia a otras &amp;ventanas:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="904"/>
+        <location filename="../../build/src/ui_obconf.h" line="1087"/>
         <source>Amount of resistance against screen &amp;edges:</source>
         <translation>Cantidad de resistencia a los bordes de la &amp;pantalla:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="905"/>
+        <location filename="../../build/src/ui_obconf.h" line="1088"/>
         <source>&amp;Amount of time to wait before switching:</source>
         <translation>&amp;Tiempo a esperar antes de cambiar:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="906"/>
+        <location filename="../../build/src/ui_obconf.h" line="1089"/>
         <source>&amp;Switch desktops when moving a window past the screen edge</source>
         <translation>Ca&amp;mbiar de escritorio al mover una ventana más allá del borde de la pantalla</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="914"/>
+        <location filename="../../build/src/ui_obconf.h" line="1097"/>
         <source>Fixed &amp;y position:</source>
         <translation>Posición &amp;Y fija:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="921"/>
+        <location filename="../../build/src/ui_obconf.h" line="1104"/>
         <source>Information dialog&apos;s &amp;position:</source>
         <translation>&amp;Posición del diálogo de información:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="922"/>
+        <location filename="../../build/src/ui_obconf.h" line="1105"/>
         <source>Fixed &amp;x position:</source>
         <translation>Posición &amp;X fija:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="923"/>
+        <location filename="../../build/src/ui_obconf.h" line="1106"/>
         <source>Show &amp;information dialog:</source>
         <translation>Mostrar diálogo de &amp;información:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="938"/>
+        <location filename="../../build/src/ui_obconf.h" line="1121"/>
         <source>&amp;Delay before focusing and raising windows:</source>
         <translation>&amp;Retardo antes de enfocar y elevar ventanas:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="939"/>
+        <location filename="../../build/src/ui_obconf.h" line="1122"/>
         <source>Move focus under the mouse when &amp;switching desktops</source>
         <translation>Mover el foco bajo el ratón al cam&amp;biar de escritorio</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="940"/>
+        <location filename="../../build/src/ui_obconf.h" line="1123"/>
         <source>Move focus &amp;under the mouse when the mouse is not moving</source>
         <translation>Mover el foco ba&amp;jo el ratón cuando éste no está en movimiento</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="941"/>
+        <location filename="../../build/src/ui_obconf.h" line="1124"/>
         <source>&amp;Raise windows when the mouse pointer moves over them</source>
         <translation>&amp;Elevar las ventanas cuando el puntero del ratón se mueve sobre ellas</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="943"/>
+        <location filename="../../build/src/ui_obconf.h" line="1126"/>
         <source>Double click on the &amp;titlebar:</source>
         <translation>Pulsación doble en la barra de &amp;título:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="949"/>
+        <location filename="../../build/src/ui_obconf.h" line="1132"/>
         <source>Double click ti&amp;me:</source>
         <translation>Tie&amp;mpo de pulsación doble:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="950"/>
+        <location filename="../../build/src/ui_obconf.h" line="1133"/>
         <source>&amp;Show a notification when switching desktops</source>
         <translation>&amp;Mostrar notificación al cambiar de escritorio</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="951"/>
+        <location filename="../../build/src/ui_obconf.h" line="1134"/>
         <source>&amp;Amount of time to show the notification for:</source>
         <translation>Por &amp;cuánto tiempo mostrar la notificación:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="952"/>
+        <location filename="../../build/src/ui_obconf.h" line="1135"/>
         <source>&amp;Number of desktops: </source>
         <translation>&amp;N.º de escritorios: </translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="953"/>
+        <location filename="../../build/src/ui_obconf.h" line="1136"/>
         <source>&amp;Desktop names:</source>
         <translation>Nom&amp;bres de escritorios:</translation>
     </message>
@@ -462,8 +592,9 @@ D: Omnipresente (en todos los escritorios)</translation>
         <translation>Acciones personalizadas</translation>
     </message>
     <message>
-        <location filename="../desktops.cpp" line="152"/>
-        <location filename="../desktops.cpp" line="162"/>
+        <location filename="../desktops.cpp" line="65"/>
+        <location filename="../desktops.cpp" line="87"/>
+        <location filename="../desktops.cpp" line="99"/>
         <source>(Unnamed desktop)</source>
         <translation>(Escritorio sin nombre)</translation>
     </message>
@@ -476,6 +607,20 @@ D: Omnipresente (en todos los escritorios)</translation>
         <location filename="../maindialog.cpp" line="77"/>
         <source>A preferences manager for Openbox
 
+Copyright (c) 2014-2015
+
+Authors:
+* Hong Jen Yee (PCMan) &lt;pcman.tw@gmail.com&gt;
+
+The program is based on ObConf developed by the following developers.
+* Dana Jansens &lt;danakj@orodu.net&gt;
+* Tim Riley &lt;tr@slackzone.org&gt;
+* Javeed Shaikh &lt;syscrash2k@gmail.com&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A preferences manager for Openbox
+
 Copyright (c) 2003-2013
 
 Authors:
@@ -483,7 +628,7 @@ Authors:
 * Dana Jansens &lt;danakj@orodu.net&gt;
 * Tim Riley &lt;tr@slackzone.org&gt;
 * Javeed Shaikh &lt;syscrash2k@gmail.com&gt;</source>
-        <translation>Un gestor de configuración para Openbox
+        <translation type="vanished">Un gestor de configuración para Openbox
 
 Copyright © 2003-2013
 

src/translations/obconf-qt_gl.ts

@@ -17,237 +17,237 @@
 <context>
     <name>MainDialog</name>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="844"/>
+        <location filename="../../build/src/ui_obconf.h" line="1027"/>
         <source>Mouse</source>
         <translation>Rato</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="829"/>
+        <location filename="../../build/src/ui_obconf.h" line="1012"/>
         <source>Window Manager Preferences</source>
         <translation>Preferencias do xestor de xanelas</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="834"/>
+        <location filename="../../build/src/ui_obconf.h" line="1017"/>
         <source>Theme</source>
         <translation>Tema</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="836"/>
+        <location filename="../../build/src/ui_obconf.h" line="1019"/>
         <source>Appearance</source>
         <translation>Aparencia</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="838"/>
+        <location filename="../../build/src/ui_obconf.h" line="1021"/>
         <source>Font</source>
         <translation>Tipo de letra</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="840"/>
-        <location filename="../../build/src/ui_obconf.h" line="855"/>
+        <location filename="../../build/src/ui_obconf.h" line="1023"/>
+        <location filename="../../build/src/ui_obconf.h" line="1038"/>
         <source>Windows</source>
         <translation>Xanelas</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="842"/>
+        <location filename="../../build/src/ui_obconf.h" line="1025"/>
         <source>Move &amp; Resize</source>
         <translation>Mover e reaxustar</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="846"/>
+        <location filename="../../build/src/ui_obconf.h" line="1029"/>
         <source>Desktops</source>
         <translation>Escritorios</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="848"/>
+        <location filename="../../build/src/ui_obconf.h" line="1031"/>
         <source>Margins</source>
         <translation>Marxes</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="850"/>
+        <location filename="../../build/src/ui_obconf.h" line="1033"/>
         <source>Dock</source>
         <translation>Doca</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="858"/>
+        <location filename="../../build/src/ui_obconf.h" line="1041"/>
         <source>Window Titles</source>
         <translation>Títulos de xanela</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="859"/>
+        <location filename="../../build/src/ui_obconf.h" line="1042"/>
         <source>Button order:</source>
         <translation>Orde dos botóns</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="900"/>
+        <location filename="../../build/src/ui_obconf.h" line="1083"/>
         <source>Moving and Resizing Windows</source>
         <translation>Mover e redimensionar as xanelas</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="907"/>
+        <location filename="../../build/src/ui_obconf.h" line="1090"/>
         <source>Information Dialog</source>
         <translation>Diálogo de información</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="936"/>
+        <location filename="../../build/src/ui_obconf.h" line="1119"/>
         <source>Focusing Windows</source>
         <translation>Xanelas en foco</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="937"/>
+        <location filename="../../build/src/ui_obconf.h" line="1120"/>
         <source>Focus windows when the mouse pointer moves over them</source>
         <translation>Pon en foco as xanelas cando o rato pasa sobre elas</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="942"/>
+        <location filename="../../build/src/ui_obconf.h" line="1125"/>
         <source>Titlebar</source>
         <translation>Barra de título</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="954"/>
+        <location filename="../../build/src/ui_obconf.h" line="1137"/>
         <source>Desktop Margins</source>
         <translation>Marxes do escritorio</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="955"/>
+        <location filename="../../build/src/ui_obconf.h" line="1138"/>
         <source>Desktop margins are reserved areas on the edge of your screen.  New windows will not be placed within a margin, and maximized windows will not cover them.</source>
         <translation>As marxes de escritorio son áreas reservadas no bordo da pantalla.  As novas xanelas no se situaran dentro dunha marxe, e as xanelas maximizadas non os cubrirán.</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="956"/>
+        <location filename="../../build/src/ui_obconf.h" line="1139"/>
         <source>Left:</source>
         <translation>Esquerda:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="957"/>
-        <location filename="../../build/src/ui_obconf.h" line="959"/>
-        <location filename="../../build/src/ui_obconf.h" line="961"/>
-        <location filename="../../build/src/ui_obconf.h" line="963"/>
+        <location filename="../../build/src/ui_obconf.h" line="1140"/>
+        <location filename="../../build/src/ui_obconf.h" line="1142"/>
+        <location filename="../../build/src/ui_obconf.h" line="1144"/>
+        <location filename="../../build/src/ui_obconf.h" line="1146"/>
         <source>px</source>
         <translation>px</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="958"/>
+        <location filename="../../build/src/ui_obconf.h" line="1141"/>
         <source>Top:</source>
         <translation>Arriba:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="960"/>
+        <location filename="../../build/src/ui_obconf.h" line="1143"/>
         <source>Right:</source>
         <translation>Dereita:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="962"/>
+        <location filename="../../build/src/ui_obconf.h" line="1145"/>
         <source>Bottom:</source>
         <translation>Abaixo:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="885"/>
+        <location filename="../../build/src/ui_obconf.h" line="1068"/>
         <source>All monitors</source>
         <translation>Todos os monitores</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="886"/>
+        <location filename="../../build/src/ui_obconf.h" line="1069"/>
         <source>The active monitor</source>
         <translation>O monitor activo</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="887"/>
+        <location filename="../../build/src/ui_obconf.h" line="1070"/>
         <source>The monitor with the mouse</source>
         <translation>O monitor co rato</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="890"/>
+        <location filename="../../build/src/ui_obconf.h" line="1073"/>
         <source>Primary Monitor</source>
         <translation>Monitor primario</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="891"/>
+        <location filename="../../build/src/ui_obconf.h" line="1074"/>
         <source>The primary monitor is where Openbox will place dialogs, such as the one used for cycling windows.</source>
         <translation>O monitor primario é no que o Openbox colocará os cadros de diálogo, como o que se utiliza para o carrusel de xanelas.</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="895"/>
+        <location filename="../../build/src/ui_obconf.h" line="1078"/>
         <source>Fixed Monitor</source>
         <translation>Monitor fixo</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="896"/>
+        <location filename="../../build/src/ui_obconf.h" line="1079"/>
         <source>Active Monitor</source>
         <translation>Monitor activo</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="897"/>
+        <location filename="../../build/src/ui_obconf.h" line="1080"/>
         <source>Monitor With Mouse Pointer</source>
         <translation>Monitor co punteiro do rato</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="910"/>
-        <location filename="../../build/src/ui_obconf.h" line="917"/>
+        <location filename="../../build/src/ui_obconf.h" line="1093"/>
+        <location filename="../../build/src/ui_obconf.h" line="1100"/>
         <source>Centered</source>
         <translation>Centrado</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="911"/>
+        <location filename="../../build/src/ui_obconf.h" line="1094"/>
         <source>From left edge</source>
         <translation>Desde o bordo esquerdo</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="912"/>
+        <location filename="../../build/src/ui_obconf.h" line="1095"/>
         <source>From right edge</source>
         <translation>Desde o bordo dereito</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="918"/>
+        <location filename="../../build/src/ui_obconf.h" line="1101"/>
         <source>From top edge</source>
         <translation>Desde o bordo superior</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="919"/>
+        <location filename="../../build/src/ui_obconf.h" line="1102"/>
         <source>From bottom edge</source>
         <translation>Desde o bordo inferior</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="926"/>
+        <location filename="../../build/src/ui_obconf.h" line="1109"/>
         <source>When resizing terminal windows</source>
         <translation>Ao cambiar o tamaño das xanelas do terminal</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="927"/>
+        <location filename="../../build/src/ui_obconf.h" line="1110"/>
         <source>Always</source>
         <translation>Sempre</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="928"/>
+        <location filename="../../build/src/ui_obconf.h" line="1111"/>
         <source>Never</source>
         <translation>Nunca</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="932"/>
+        <location filename="../../build/src/ui_obconf.h" line="1115"/>
         <source>Centered on the window</source>
         <translation>Centrado na xanela</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="933"/>
+        <location filename="../../build/src/ui_obconf.h" line="1116"/>
         <source>Above the window</source>
         <translation>Por riba da xanela</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="934"/>
+        <location filename="../../build/src/ui_obconf.h" line="1117"/>
         <source>Fixed position on screen</source>
         <translation>Posición fixa na pantalla</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="946"/>
+        <location filename="../../build/src/ui_obconf.h" line="1129"/>
         <source>Maximizes the window</source>
         <translation>Maximizar a xanela</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="947"/>
+        <location filename="../../build/src/ui_obconf.h" line="1130"/>
         <source>Shades the window</source>
         <translation>Ensombrecer a xanela</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="860"/>
+        <location filename="../../build/src/ui_obconf.h" line="1043"/>
         <source>N: Window icon
 L: Window label (Title)
 I: Iconify (Minimize)
@@ -264,192 +264,322 @@ S: Cortina (enrolar)
 D: Omnipresente (en todos os escritorios)</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="888"/>
+        <location filename="../../build/src/ui_obconf.h" line="1071"/>
         <source>Primary monitor</source>
         <translation>Monitor primario</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="964"/>
+        <location filename="../../build/src/ui_obconf.h" line="1147"/>
+        <source>The dock is a special container for &quot;dockapps&quot;, or dock applications.  It is not visible on screen until a dockapp is run.  Dockapps can be used to show things like a clock, or to provide you with a system tray.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1148"/>
+        <source>Position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1149"/>
+        <source>&amp;Position:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1152"/>
+        <source>Top Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1153"/>
+        <source>Top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1154"/>
+        <source>Top Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1155"/>
+        <source>Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1156"/>
+        <source>Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1157"/>
+        <source>Bottom Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1158"/>
+        <source>Bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1159"/>
+        <source>Bottom Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1160"/>
+        <source>Floating</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1162"/>
+        <source>&amp;Floating position:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1163"/>
+        <source>x</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1164"/>
+        <source>Allow &amp;windows to be placed within the dock&apos;s area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1165"/>
+        <source>&amp;Orientation: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1168"/>
+        <source>Vertical</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1169"/>
+        <source>Horizontal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1171"/>
+        <source>Stacking</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1172"/>
+        <source>Keep dock &amp;above other windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1173"/>
+        <source>A&amp;llow dock to be both above and below windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1174"/>
+        <source>Keep dock &amp;below other windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1175"/>
+        <source>Hiding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1176"/>
+        <source>&amp;Delay before hiding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1177"/>
+        <source>Delay before &amp;showing:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1178"/>
+        <source>&amp;Hide off screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1179"/>
         <source>About</source>
         <translation>Sobre</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="853"/>
+        <location filename="../../build/src/ui_obconf.h" line="1036"/>
         <source>&amp;Install a new theme...</source>
         <translation>&amp;Instalar un tema novo…</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="854"/>
+        <location filename="../../build/src/ui_obconf.h" line="1037"/>
         <source>Create a theme &amp;archive (.obt)...</source>
         <translation>Crear un &amp;arquivo de tema (.obt)...</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="856"/>
+        <location filename="../../build/src/ui_obconf.h" line="1039"/>
         <source>&amp;Windows retain a border when undecorated</source>
         <translation>As &amp;xanelas conservan un bordo cando non hai decoración</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="857"/>
+        <location filename="../../build/src/ui_obconf.h" line="1040"/>
         <source>A&amp;nimate iconify and restore</source>
         <translation>A&amp;nimar a iconificación e a restauración</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="873"/>
+        <location filename="../../build/src/ui_obconf.h" line="1056"/>
         <source>&amp;Active window title: </source>
         <translation>Título da xanela &amp;activa: </translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="874"/>
+        <location filename="../../build/src/ui_obconf.h" line="1057"/>
         <source>&amp;Inactive window title: </source>
         <translation>Título da xanela &amp;inactiva: </translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="875"/>
+        <location filename="../../build/src/ui_obconf.h" line="1058"/>
         <source>Menu &amp;header: </source>
         <translation>&amp;Cabeceira do menú: </translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="876"/>
+        <location filename="../../build/src/ui_obconf.h" line="1059"/>
         <source>&amp;Menu Item: </source>
         <translation>&amp;Elemento do menú: </translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="877"/>
+        <location filename="../../build/src/ui_obconf.h" line="1060"/>
         <source>Active &amp;On-screen display: </source>
         <translation>Vista en &amp;pantalla activada: </translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="878"/>
+        <location filename="../../build/src/ui_obconf.h" line="1061"/>
         <source>Inactive O&amp;n-screen display: </source>
         <translation>Vista en pa&amp;ntalla desactivada: </translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="879"/>
+        <location filename="../../build/src/ui_obconf.h" line="1062"/>
         <source>Focus &amp;new windows when they appear</source>
         <translation>Poñer en foco as xanelas &amp;novas cando aparezan</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="880"/>
+        <location filename="../../build/src/ui_obconf.h" line="1063"/>
         <source>&amp;Place new windows under the mouse pointer</source>
         <translation>&amp;Poñer as xanelas novas baixo o punteiro do rato</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="881"/>
+        <location filename="../../build/src/ui_obconf.h" line="1064"/>
         <source>&amp;Center new windows when they are placed</source>
         <translation>&amp;Centrar as novas xanelas ao seren posicionadas</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="882"/>
+        <location filename="../../build/src/ui_obconf.h" line="1065"/>
         <source>Prefer to place new windows &amp;on:</source>
         <translation>&amp;Centrar as novas xanelas cando se coloquen</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="892"/>
+        <location filename="../../build/src/ui_obconf.h" line="1075"/>
         <source>Primary &amp;monitor:</source>
         <translation>Monitor &amp;primario</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="899"/>
+        <location filename="../../build/src/ui_obconf.h" line="1082"/>
         <source>&amp;Fixed monitor:</source>
         <translation>Monitor &amp;fixo</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="901"/>
+        <location filename="../../build/src/ui_obconf.h" line="1084"/>
         <source>Update the window contents while &amp;resizing</source>
         <translation>Actualizar o contido das xanelas ao &amp;redimensionar</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="902"/>
+        <location filename="../../build/src/ui_obconf.h" line="1085"/>
         <source>Drag &amp;threshold distance:</source>
         <translation>&amp;Limiar de distancia do arrastre:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="903"/>
+        <location filename="../../build/src/ui_obconf.h" line="1086"/>
         <source>Amount of resistance against other &amp;windows:</source>
         <translation>Canta resistencia fronte a outras &amp;xanelas:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="904"/>
+        <location filename="../../build/src/ui_obconf.h" line="1087"/>
         <source>Amount of resistance against screen &amp;edges:</source>
         <translation>Canta resistencia fronte aos &amp;bordos da pantalla:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="905"/>
+        <location filename="../../build/src/ui_obconf.h" line="1088"/>
         <source>&amp;Amount of time to wait before switching:</source>
         <translation>Canto &amp;tempo que debe transcorrer antes de cambiar:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="906"/>
+        <location filename="../../build/src/ui_obconf.h" line="1089"/>
         <source>&amp;Switch desktops when moving a window past the screen edge</source>
         <translation>&amp;Cambiar entre escritorios cando se move unha xanela fora do bordo da pantalla</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="914"/>
+        <location filename="../../build/src/ui_obconf.h" line="1097"/>
         <source>Fixed &amp;y position:</source>
         <translation>Posición &amp;Y fixa:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="921"/>
+        <location filename="../../build/src/ui_obconf.h" line="1104"/>
         <source>Information dialog&apos;s &amp;position:</source>
         <translation>&amp;Posición dos diálogos de información:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="922"/>
+        <location filename="../../build/src/ui_obconf.h" line="1105"/>
         <source>Fixed &amp;x position:</source>
         <translation>Posición &amp;X fixa:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="923"/>
+        <location filename="../../build/src/ui_obconf.h" line="1106"/>
         <source>Show &amp;information dialog:</source>
         <translation>Amosar o diálogo de &amp;información:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="938"/>
+        <location filename="../../build/src/ui_obconf.h" line="1121"/>
         <source>&amp;Delay before focusing and raising windows:</source>
         <translation>&amp;Atraso antes de enfocar e elevar as xanelas:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="939"/>
+        <location filename="../../build/src/ui_obconf.h" line="1122"/>
         <source>Move focus under the mouse when &amp;switching desktops</source>
         <translation>Mover o foco baixo o rato ao &amp;cambiar de escritorio</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="940"/>
+        <location filename="../../build/src/ui_obconf.h" line="1123"/>
         <source>Move focus &amp;under the mouse when the mouse is not moving</source>
         <translation>Mover o foco &amp;baixo o rato cando se move o ratpo</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="941"/>
+        <location filename="../../build/src/ui_obconf.h" line="1124"/>
         <source>&amp;Raise windows when the mouse pointer moves over them</source>
         <translation>&amp;Elevar as xanelas cando o rato pase sobre elas </translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="943"/>
+        <location filename="../../build/src/ui_obconf.h" line="1126"/>
         <source>Double click on the &amp;titlebar:</source>
         <translation>Duplo clic na barra de &amp;título:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="949"/>
+        <location filename="../../build/src/ui_obconf.h" line="1132"/>
         <source>Double click ti&amp;me:</source>
         <translation>Te&amp;mpo de duplo clic:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="950"/>
+        <location filename="../../build/src/ui_obconf.h" line="1133"/>
         <source>&amp;Show a notification when switching desktops</source>
         <translation>&amp;Amosar un aviso ao cambiar de escritorio</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="951"/>
+        <location filename="../../build/src/ui_obconf.h" line="1134"/>
         <source>&amp;Amount of time to show the notification for:</source>
         <translation>&amp;Tempo no que amosar o aviso para:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="952"/>
+        <location filename="../../build/src/ui_obconf.h" line="1135"/>
         <source>&amp;Number of desktops: </source>
         <translation>&amp;Número de escritorios: </translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="953"/>
+        <location filename="../../build/src/ui_obconf.h" line="1136"/>
         <source>&amp;Desktop names:</source>
         <translation>Nomes dos &amp;escritorios:</translation>
     </message>
@@ -462,8 +592,9 @@ D: Omnipresente (en todos os escritorios)</translation>
         <translation>Accións personalizadas</translation>
     </message>
     <message>
-        <location filename="../desktops.cpp" line="152"/>
-        <location filename="../desktops.cpp" line="162"/>
+        <location filename="../desktops.cpp" line="65"/>
+        <location filename="../desktops.cpp" line="87"/>
+        <location filename="../desktops.cpp" line="99"/>
         <source>(Unnamed desktop)</source>
         <translation>(Escritorio sen nome)</translation>
     </message>
@@ -476,6 +607,20 @@ D: Omnipresente (en todos os escritorios)</translation>
         <location filename="../maindialog.cpp" line="77"/>
         <source>A preferences manager for Openbox
 
+Copyright (c) 2014-2015
+
+Authors:
+* Hong Jen Yee (PCMan) &lt;pcman.tw@gmail.com&gt;
+
+The program is based on ObConf developed by the following developers.
+* Dana Jansens &lt;danakj@orodu.net&gt;
+* Tim Riley &lt;tr@slackzone.org&gt;
+* Javeed Shaikh &lt;syscrash2k@gmail.com&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A preferences manager for Openbox
+
 Copyright (c) 2003-2013
 
 Authors:
@@ -483,7 +628,7 @@ Authors:
 * Dana Jansens &lt;danakj@orodu.net&gt;
 * Tim Riley &lt;tr@slackzone.org&gt;
 * Javeed Shaikh &lt;syscrash2k@gmail.com&gt;</source>
-        <translation>Un xestor de preferencias para o Openbox
+        <translation type="vanished">Un xestor de preferencias para o Openbox
 
 Copyright (c) 2003-2013
 

src/translations/obconf-qt_hr.ts

@@ -17,237 +17,237 @@
 <context>
     <name>MainDialog</name>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="844"/>
+        <location filename="../../build/src/ui_obconf.h" line="1027"/>
         <source>Mouse</source>
         <translation>Miš</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="829"/>
+        <location filename="../../build/src/ui_obconf.h" line="1012"/>
         <source>Window Manager Preferences</source>
         <translation>Osobitosti upravitelja prozora</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="834"/>
+        <location filename="../../build/src/ui_obconf.h" line="1017"/>
         <source>Theme</source>
         <translation>Tema</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="836"/>
+        <location filename="../../build/src/ui_obconf.h" line="1019"/>
         <source>Appearance</source>
         <translation>Izgled</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="838"/>
+        <location filename="../../build/src/ui_obconf.h" line="1021"/>
         <source>Font</source>
         <translation>Font</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="840"/>
-        <location filename="../../build/src/ui_obconf.h" line="855"/>
+        <location filename="../../build/src/ui_obconf.h" line="1023"/>
+        <location filename="../../build/src/ui_obconf.h" line="1038"/>
         <source>Windows</source>
         <translation>Prozori</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="842"/>
+        <location filename="../../build/src/ui_obconf.h" line="1025"/>
         <source>Move &amp; Resize</source>
         <translation>Pomakni &amp; promjeni veličinu</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="846"/>
+        <location filename="../../build/src/ui_obconf.h" line="1029"/>
         <source>Desktops</source>
         <translation>Radne površine</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="848"/>
+        <location filename="../../build/src/ui_obconf.h" line="1031"/>
         <source>Margins</source>
         <translation>Margine</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="850"/>
+        <location filename="../../build/src/ui_obconf.h" line="1033"/>
         <source>Dock</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="858"/>
+        <location filename="../../build/src/ui_obconf.h" line="1041"/>
         <source>Window Titles</source>
         <translation>Naslovi prozora</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="859"/>
+        <location filename="../../build/src/ui_obconf.h" line="1042"/>
         <source>Button order:</source>
         <translation>Redoslijed dugmadi:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="900"/>
+        <location filename="../../build/src/ui_obconf.h" line="1083"/>
         <source>Moving and Resizing Windows</source>
         <translation>Pomicanje i promjena veličine prozora</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="907"/>
+        <location filename="../../build/src/ui_obconf.h" line="1090"/>
         <source>Information Dialog</source>
         <translation>Informacijski dijalog</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="936"/>
+        <location filename="../../build/src/ui_obconf.h" line="1119"/>
         <source>Focusing Windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="937"/>
+        <location filename="../../build/src/ui_obconf.h" line="1120"/>
         <source>Focus windows when the mouse pointer moves over them</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="942"/>
+        <location filename="../../build/src/ui_obconf.h" line="1125"/>
         <source>Titlebar</source>
         <translation>Naslovna traka</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="954"/>
+        <location filename="../../build/src/ui_obconf.h" line="1137"/>
         <source>Desktop Margins</source>
         <translation>Margine radne površine</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="955"/>
+        <location filename="../../build/src/ui_obconf.h" line="1138"/>
         <source>Desktop margins are reserved areas on the edge of your screen.  New windows will not be placed within a margin, and maximized windows will not cover them.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="956"/>
+        <location filename="../../build/src/ui_obconf.h" line="1139"/>
         <source>Left:</source>
         <translation>Lijevo:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="957"/>
-        <location filename="../../build/src/ui_obconf.h" line="959"/>
-        <location filename="../../build/src/ui_obconf.h" line="961"/>
-        <location filename="../../build/src/ui_obconf.h" line="963"/>
+        <location filename="../../build/src/ui_obconf.h" line="1140"/>
+        <location filename="../../build/src/ui_obconf.h" line="1142"/>
+        <location filename="../../build/src/ui_obconf.h" line="1144"/>
+        <location filename="../../build/src/ui_obconf.h" line="1146"/>
         <source>px</source>
         <translation>px</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="958"/>
+        <location filename="../../build/src/ui_obconf.h" line="1141"/>
         <source>Top:</source>
         <translation>Vrh:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="960"/>
+        <location filename="../../build/src/ui_obconf.h" line="1143"/>
         <source>Right:</source>
         <translation>Desno:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="962"/>
+        <location filename="../../build/src/ui_obconf.h" line="1145"/>
         <source>Bottom:</source>
         <translation>Dno:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="885"/>
+        <location filename="../../build/src/ui_obconf.h" line="1068"/>
         <source>All monitors</source>
         <translation>Svi monitori</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="886"/>
+        <location filename="../../build/src/ui_obconf.h" line="1069"/>
         <source>The active monitor</source>
         <translation>Aktivni monitor</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="887"/>
+        <location filename="../../build/src/ui_obconf.h" line="1070"/>
         <source>The monitor with the mouse</source>
         <translation>Monitor s  mišem</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="890"/>
+        <location filename="../../build/src/ui_obconf.h" line="1073"/>
         <source>Primary Monitor</source>
         <translation>Osnovni monitor</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="891"/>
+        <location filename="../../build/src/ui_obconf.h" line="1074"/>
         <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="895"/>
+        <location filename="../../build/src/ui_obconf.h" line="1078"/>
         <source>Fixed Monitor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="896"/>
+        <location filename="../../build/src/ui_obconf.h" line="1079"/>
         <source>Active Monitor</source>
         <translation>Aktivni monitor</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="897"/>
+        <location filename="../../build/src/ui_obconf.h" line="1080"/>
         <source>Monitor With Mouse Pointer</source>
         <translation>Monitor sa pokazivačem miša</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="910"/>
-        <location filename="../../build/src/ui_obconf.h" line="917"/>
+        <location filename="../../build/src/ui_obconf.h" line="1093"/>
+        <location filename="../../build/src/ui_obconf.h" line="1100"/>
         <source>Centered</source>
         <translation>Centrirano</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="911"/>
+        <location filename="../../build/src/ui_obconf.h" line="1094"/>
         <source>From left edge</source>
         <translation>Sa lijevog ruba</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="912"/>
+        <location filename="../../build/src/ui_obconf.h" line="1095"/>
         <source>From right edge</source>
         <translation>Sa desnog ruba</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="918"/>
+        <location filename="../../build/src/ui_obconf.h" line="1101"/>
         <source>From top edge</source>
         <translation>Sa gornjeg ruba</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="919"/>
+        <location filename="../../build/src/ui_obconf.h" line="1102"/>
         <source>From bottom edge</source>
         <translation>Sa donjeg ruba</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="926"/>
+        <location filename="../../build/src/ui_obconf.h" line="1109"/>
         <source>When resizing terminal windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="927"/>
+        <location filename="../../build/src/ui_obconf.h" line="1110"/>
         <source>Always</source>
         <translation>Uvijek</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="928"/>
+        <location filename="../../build/src/ui_obconf.h" line="1111"/>
         <source>Never</source>
         <translation>Nikada</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="932"/>
+        <location filename="../../build/src/ui_obconf.h" line="1115"/>
         <source>Centered on the window</source>
         <translation>Centrirano na prozoru</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="933"/>
+        <location filename="../../build/src/ui_obconf.h" line="1116"/>
         <source>Above the window</source>
         <translation>Iznad prozora</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="934"/>
+        <location filename="../../build/src/ui_obconf.h" line="1117"/>
         <source>Fixed position on screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="946"/>
+        <location filename="../../build/src/ui_obconf.h" line="1129"/>
         <source>Maximizes the window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="947"/>
+        <location filename="../../build/src/ui_obconf.h" line="1130"/>
         <source>Shades the window</source>
         <translation>Osjenčava prozor</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="860"/>
+        <location filename="../../build/src/ui_obconf.h" line="1043"/>
         <source>N: Window icon
 L: Window label (Title)
 I: Iconify (Minimize)
@@ -258,192 +258,322 @@ D: Omnipresent (On all desktops)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="888"/>
+        <location filename="../../build/src/ui_obconf.h" line="1071"/>
         <source>Primary monitor</source>
         <translation>Osnovni monitor</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="964"/>
+        <location filename="../../build/src/ui_obconf.h" line="1147"/>
+        <source>The dock is a special container for &quot;dockapps&quot;, or dock applications.  It is not visible on screen until a dockapp is run.  Dockapps can be used to show things like a clock, or to provide you with a system tray.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1148"/>
+        <source>Position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1149"/>
+        <source>&amp;Position:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1152"/>
+        <source>Top Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1153"/>
+        <source>Top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1154"/>
+        <source>Top Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1155"/>
+        <source>Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1156"/>
+        <source>Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1157"/>
+        <source>Bottom Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1158"/>
+        <source>Bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1159"/>
+        <source>Bottom Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1160"/>
+        <source>Floating</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1162"/>
+        <source>&amp;Floating position:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1163"/>
+        <source>x</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1164"/>
+        <source>Allow &amp;windows to be placed within the dock&apos;s area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1165"/>
+        <source>&amp;Orientation: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1168"/>
+        <source>Vertical</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1169"/>
+        <source>Horizontal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1171"/>
+        <source>Stacking</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1172"/>
+        <source>Keep dock &amp;above other windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1173"/>
+        <source>A&amp;llow dock to be both above and below windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1174"/>
+        <source>Keep dock &amp;below other windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1175"/>
+        <source>Hiding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1176"/>
+        <source>&amp;Delay before hiding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1177"/>
+        <source>Delay before &amp;showing:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1178"/>
+        <source>&amp;Hide off screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1179"/>
         <source>About</source>
         <translation>O programu</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="853"/>
+        <location filename="../../build/src/ui_obconf.h" line="1036"/>
         <source>&amp;Install a new theme...</source>
         <translation>Instaliraj novu temu…</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="854"/>
+        <location filename="../../build/src/ui_obconf.h" line="1037"/>
         <source>Create a theme &amp;archive (.obt)...</source>
         <translation>Napravi temu i arhivu (.obt)...</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="856"/>
+        <location filename="../../build/src/ui_obconf.h" line="1039"/>
         <source>&amp;Windows retain a border when undecorated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="857"/>
+        <location filename="../../build/src/ui_obconf.h" line="1040"/>
         <source>A&amp;nimate iconify and restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="873"/>
+        <location filename="../../build/src/ui_obconf.h" line="1056"/>
         <source>&amp;Active window title: </source>
         <translation>&amp;Aktivni naslov prozora: </translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="874"/>
+        <location filename="../../build/src/ui_obconf.h" line="1057"/>
         <source>&amp;Inactive window title: </source>
         <translation>&amp;Neaktivni naslov prozora: </translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="875"/>
+        <location filename="../../build/src/ui_obconf.h" line="1058"/>
         <source>Menu &amp;header: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="876"/>
+        <location filename="../../build/src/ui_obconf.h" line="1059"/>
         <source>&amp;Menu Item: </source>
         <translation>&amp;Stavka izbornika: </translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="877"/>
+        <location filename="../../build/src/ui_obconf.h" line="1060"/>
         <source>Active &amp;On-screen display: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="878"/>
+        <location filename="../../build/src/ui_obconf.h" line="1061"/>
         <source>Inactive O&amp;n-screen display: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="879"/>
+        <location filename="../../build/src/ui_obconf.h" line="1062"/>
         <source>Focus &amp;new windows when they appear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="880"/>
+        <location filename="../../build/src/ui_obconf.h" line="1063"/>
         <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"/>
+        <location filename="../../build/src/ui_obconf.h" line="1064"/>
         <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"/>
+        <location filename="../../build/src/ui_obconf.h" line="1065"/>
         <source>Prefer to place new windows &amp;on:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="892"/>
+        <location filename="../../build/src/ui_obconf.h" line="1075"/>
         <source>Primary &amp;monitor:</source>
         <translation>Osnovni &amp;monitor:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="899"/>
+        <location filename="../../build/src/ui_obconf.h" line="1082"/>
         <source>&amp;Fixed monitor:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="901"/>
+        <location filename="../../build/src/ui_obconf.h" line="1084"/>
         <source>Update the window contents while &amp;resizing</source>
         <translation>Ažuriraj sadtžaj prizora za vrijeme &amp;promjene veličine</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="902"/>
+        <location filename="../../build/src/ui_obconf.h" line="1085"/>
         <source>Drag &amp;threshold distance:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="903"/>
+        <location filename="../../build/src/ui_obconf.h" line="1086"/>
         <source>Amount of resistance against other &amp;windows:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="904"/>
+        <location filename="../../build/src/ui_obconf.h" line="1087"/>
         <source>Amount of resistance against screen &amp;edges:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="905"/>
+        <location filename="../../build/src/ui_obconf.h" line="1088"/>
         <source>&amp;Amount of time to wait before switching:</source>
         <translation>&amp;Koliko treba pričekati prije prebacivanja:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="906"/>
+        <location filename="../../build/src/ui_obconf.h" line="1089"/>
         <source>&amp;Switch desktops when moving a window past the screen edge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="914"/>
+        <location filename="../../build/src/ui_obconf.h" line="1097"/>
         <source>Fixed &amp;y position:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="921"/>
+        <location filename="../../build/src/ui_obconf.h" line="1104"/>
         <source>Information dialog&apos;s &amp;position:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="922"/>
+        <location filename="../../build/src/ui_obconf.h" line="1105"/>
         <source>Fixed &amp;x position:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="923"/>
+        <location filename="../../build/src/ui_obconf.h" line="1106"/>
         <source>Show &amp;information dialog:</source>
         <translation>Pokaži &amp;informacijski dijalog:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="938"/>
+        <location filename="../../build/src/ui_obconf.h" line="1121"/>
         <source>&amp;Delay before focusing and raising windows:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="939"/>
+        <location filename="../../build/src/ui_obconf.h" line="1122"/>
         <source>Move focus under the mouse when &amp;switching desktops</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="940"/>
+        <location filename="../../build/src/ui_obconf.h" line="1123"/>
         <source>Move focus &amp;under the mouse when the mouse is not moving</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="941"/>
+        <location filename="../../build/src/ui_obconf.h" line="1124"/>
         <source>&amp;Raise windows when the mouse pointer moves over them</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="943"/>
+        <location filename="../../build/src/ui_obconf.h" line="1126"/>
         <source>Double click on the &amp;titlebar:</source>
         <translation>Dvostruki klik na &amp;naslovnu traku:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="949"/>
+        <location filename="../../build/src/ui_obconf.h" line="1132"/>
         <source>Double click ti&amp;me:</source>
         <translation>Vrijeme dvostrukog kli&amp;ka:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="950"/>
+        <location filename="../../build/src/ui_obconf.h" line="1133"/>
         <source>&amp;Show a notification when switching desktops</source>
         <translation>&amp;Pokaži obavjest kada prebacuješ radne površine</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="951"/>
+        <location filename="../../build/src/ui_obconf.h" line="1134"/>
         <source>&amp;Amount of time to show the notification for:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="952"/>
+        <location filename="../../build/src/ui_obconf.h" line="1135"/>
         <source>&amp;Number of desktops: </source>
         <translation>&amp;Broj radnih površina: </translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="953"/>
+        <location filename="../../build/src/ui_obconf.h" line="1136"/>
         <source>&amp;Desktop names:</source>
         <translation>&amp;Imena radnih površina:</translation>
     </message>
@@ -456,8 +586,9 @@ D: Omnipresent (On all desktops)</source>
         <translation>Prilagođene radnje</translation>
     </message>
     <message>
-        <location filename="../desktops.cpp" line="152"/>
-        <location filename="../desktops.cpp" line="162"/>
+        <location filename="../desktops.cpp" line="65"/>
+        <location filename="../desktops.cpp" line="87"/>
+        <location filename="../desktops.cpp" line="99"/>
         <source>(Unnamed desktop)</source>
         <translation>(Neimenovana radna površina)</translation>
     </message>
@@ -470,6 +601,20 @@ D: Omnipresent (On all desktops)</source>
         <location filename="../maindialog.cpp" line="77"/>
         <source>A preferences manager for Openbox
 
+Copyright (c) 2014-2015
+
+Authors:
+* Hong Jen Yee (PCMan) &lt;pcman.tw@gmail.com&gt;
+
+The program is based on ObConf developed by the following developers.
+* Dana Jansens &lt;danakj@orodu.net&gt;
+* Tim Riley &lt;tr@slackzone.org&gt;
+* Javeed Shaikh &lt;syscrash2k@gmail.com&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A preferences manager for Openbox
+
 Copyright (c) 2003-2013
 
 Authors:
@@ -477,7 +622,7 @@ Authors:
 * Dana Jansens &lt;danakj@orodu.net&gt;
 * Tim Riley &lt;tr@slackzone.org&gt;
 * Javeed Shaikh &lt;syscrash2k@gmail.com&gt;</source>
-        <translation>Upravitelj osobitostima za Openbox
+        <translation type="vanished">Upravitelj osobitostima za Openbox
 
 Autorska prava (c) 2003-2013
 

src/translations/obconf-qt_id.ts

@@ -17,237 +17,237 @@
 <context>
     <name>MainDialog</name>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="844"/>
+        <location filename="../../build/src/ui_obconf.h" line="1027"/>
         <source>Mouse</source>
         <translation>Tetikus</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="829"/>
+        <location filename="../../build/src/ui_obconf.h" line="1012"/>
         <source>Window Manager Preferences</source>
         <translation>Preferensi Manajer Jendela</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="834"/>
+        <location filename="../../build/src/ui_obconf.h" line="1017"/>
         <source>Theme</source>
         <translation>Tema</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="836"/>
+        <location filename="../../build/src/ui_obconf.h" line="1019"/>
         <source>Appearance</source>
         <translation>Penampilan</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="838"/>
+        <location filename="../../build/src/ui_obconf.h" line="1021"/>
         <source>Font</source>
         <translation>Fonta</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="840"/>
-        <location filename="../../build/src/ui_obconf.h" line="855"/>
+        <location filename="../../build/src/ui_obconf.h" line="1023"/>
+        <location filename="../../build/src/ui_obconf.h" line="1038"/>
         <source>Windows</source>
         <translation>Jendela</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="842"/>
+        <location filename="../../build/src/ui_obconf.h" line="1025"/>
         <source>Move &amp; Resize</source>
         <translation>Pindah &amp; Ubah Ukuran</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="846"/>
+        <location filename="../../build/src/ui_obconf.h" line="1029"/>
         <source>Desktops</source>
         <translation>Desktop</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="848"/>
+        <location filename="../../build/src/ui_obconf.h" line="1031"/>
         <source>Margins</source>
         <translation>Marjin</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="850"/>
+        <location filename="../../build/src/ui_obconf.h" line="1033"/>
         <source>Dock</source>
         <translation>Dok</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="858"/>
+        <location filename="../../build/src/ui_obconf.h" line="1041"/>
         <source>Window Titles</source>
         <translation>Judul Jendela</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="859"/>
+        <location filename="../../build/src/ui_obconf.h" line="1042"/>
         <source>Button order:</source>
         <translation>Urutan tombol:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="900"/>
+        <location filename="../../build/src/ui_obconf.h" line="1083"/>
         <source>Moving and Resizing Windows</source>
         <translation>Memindah dan Mengubah Ukuran Jendela</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="907"/>
+        <location filename="../../build/src/ui_obconf.h" line="1090"/>
         <source>Information Dialog</source>
         <translation>Dialog Informasi</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="936"/>
+        <location filename="../../build/src/ui_obconf.h" line="1119"/>
         <source>Focusing Windows</source>
         <translation>Pemfokusan Jendela</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="937"/>
+        <location filename="../../build/src/ui_obconf.h" line="1120"/>
         <source>Focus windows when the mouse pointer moves over them</source>
         <translation>Fokuskan jendela ketika penunjuk tetikus bergerak di atas mereka</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="942"/>
+        <location filename="../../build/src/ui_obconf.h" line="1125"/>
         <source>Titlebar</source>
         <translation>Bilah judul</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="954"/>
+        <location filename="../../build/src/ui_obconf.h" line="1137"/>
         <source>Desktop Margins</source>
         <translation>Marjin Desktop</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="955"/>
+        <location filename="../../build/src/ui_obconf.h" line="1138"/>
         <source>Desktop margins are reserved areas on the edge of your screen.  New windows will not be placed within a margin, and maximized windows will not cover them.</source>
         <translation>Marjin desktop adalah wilayah yang dicadangkan di tepi layar.  Jendela baru tak akan ditempatkan di dalam jarmin, dan jendela yang dimaksimalkan tak akan menutupinya.</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="956"/>
+        <location filename="../../build/src/ui_obconf.h" line="1139"/>
         <source>Left:</source>
         <translation>Kiri:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="957"/>
-        <location filename="../../build/src/ui_obconf.h" line="959"/>
-        <location filename="../../build/src/ui_obconf.h" line="961"/>
-        <location filename="../../build/src/ui_obconf.h" line="963"/>
+        <location filename="../../build/src/ui_obconf.h" line="1140"/>
+        <location filename="../../build/src/ui_obconf.h" line="1142"/>
+        <location filename="../../build/src/ui_obconf.h" line="1144"/>
+        <location filename="../../build/src/ui_obconf.h" line="1146"/>
         <source>px</source>
         <translation>px</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="958"/>
+        <location filename="../../build/src/ui_obconf.h" line="1141"/>
         <source>Top:</source>
         <translation>Puncak:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="960"/>
+        <location filename="../../build/src/ui_obconf.h" line="1143"/>
         <source>Right:</source>
         <translation>Kanan:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="962"/>
+        <location filename="../../build/src/ui_obconf.h" line="1145"/>
         <source>Bottom:</source>
         <translation>Dasar:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="885"/>
+        <location filename="../../build/src/ui_obconf.h" line="1068"/>
         <source>All monitors</source>
         <translation>Semua monitor</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="886"/>
+        <location filename="../../build/src/ui_obconf.h" line="1069"/>
         <source>The active monitor</source>
         <translation>Monitor yang aktif</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="887"/>
+        <location filename="../../build/src/ui_obconf.h" line="1070"/>
         <source>The monitor with the mouse</source>
         <translation>Monitor dengan tetikus</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="890"/>
+        <location filename="../../build/src/ui_obconf.h" line="1073"/>
         <source>Primary Monitor</source>
         <translation>Monitor Primer</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="891"/>
+        <location filename="../../build/src/ui_obconf.h" line="1074"/>
         <source>The primary monitor is where Openbox will place dialogs, such as the one used for cycling windows.</source>
         <translation>Monitor primer adalah tempat dimana Openbox akan meletakkan dialog, seperti misalnya yang dipakai untuk berpindah jendela.</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="895"/>
+        <location filename="../../build/src/ui_obconf.h" line="1078"/>
         <source>Fixed Monitor</source>
         <translation>Monitor Tetap</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="896"/>
+        <location filename="../../build/src/ui_obconf.h" line="1079"/>
         <source>Active Monitor</source>
         <translation>Monitor Aktif</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="897"/>
+        <location filename="../../build/src/ui_obconf.h" line="1080"/>
         <source>Monitor With Mouse Pointer</source>
         <translation>Monitor Dengan Penunjuk Tetikus</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="910"/>
-        <location filename="../../build/src/ui_obconf.h" line="917"/>
+        <location filename="../../build/src/ui_obconf.h" line="1093"/>
+        <location filename="../../build/src/ui_obconf.h" line="1100"/>
         <source>Centered</source>
         <translation>Rata Tengah</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="911"/>
+        <location filename="../../build/src/ui_obconf.h" line="1094"/>
         <source>From left edge</source>
         <translation>Dari tepi kiri</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="912"/>
+        <location filename="../../build/src/ui_obconf.h" line="1095"/>
         <source>From right edge</source>
         <translation>Dari tepi kanan</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="918"/>
+        <location filename="../../build/src/ui_obconf.h" line="1101"/>
         <source>From top edge</source>
         <translation>Dari puncak</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="919"/>
+        <location filename="../../build/src/ui_obconf.h" line="1102"/>
         <source>From bottom edge</source>
         <translation>Dari dasar</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="926"/>
+        <location filename="../../build/src/ui_obconf.h" line="1109"/>
         <source>When resizing terminal windows</source>
         <translation>Ketika mengubah ukuran jendela terminal</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="927"/>
+        <location filename="../../build/src/ui_obconf.h" line="1110"/>
         <source>Always</source>
         <translation>Selalu</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="928"/>
+        <location filename="../../build/src/ui_obconf.h" line="1111"/>
         <source>Never</source>
         <translation>Tak pernah</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="932"/>
+        <location filename="../../build/src/ui_obconf.h" line="1115"/>
         <source>Centered on the window</source>
         <translation>Di tengah jendela</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="933"/>
+        <location filename="../../build/src/ui_obconf.h" line="1116"/>
         <source>Above the window</source>
         <translation>Di atas jendela</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="934"/>
+        <location filename="../../build/src/ui_obconf.h" line="1117"/>
         <source>Fixed position on screen</source>
         <translation>Posisi tetap pada layar</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="946"/>
+        <location filename="../../build/src/ui_obconf.h" line="1129"/>
         <source>Maximizes the window</source>
         <translation>Maksimalkan jendela</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="947"/>
+        <location filename="../../build/src/ui_obconf.h" line="1130"/>
         <source>Shades the window</source>
         <translation>Membuat jendela berbayang</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="860"/>
+        <location filename="../../build/src/ui_obconf.h" line="1043"/>
         <source>N: Window icon
 L: Window label (Title)
 I: Iconify (Minimize)
@@ -264,192 +264,322 @@ S: Berbayang (Gulung)
 D: Selalu ada (Pada semua desktop)</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="888"/>
+        <location filename="../../build/src/ui_obconf.h" line="1071"/>
         <source>Primary monitor</source>
         <translation>Monitor primer</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="964"/>
+        <location filename="../../build/src/ui_obconf.h" line="1147"/>
+        <source>The dock is a special container for &quot;dockapps&quot;, or dock applications.  It is not visible on screen until a dockapp is run.  Dockapps can be used to show things like a clock, or to provide you with a system tray.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1148"/>
+        <source>Position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1149"/>
+        <source>&amp;Position:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1152"/>
+        <source>Top Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1153"/>
+        <source>Top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1154"/>
+        <source>Top Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1155"/>
+        <source>Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1156"/>
+        <source>Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1157"/>
+        <source>Bottom Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1158"/>
+        <source>Bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1159"/>
+        <source>Bottom Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1160"/>
+        <source>Floating</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1162"/>
+        <source>&amp;Floating position:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1163"/>
+        <source>x</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1164"/>
+        <source>Allow &amp;windows to be placed within the dock&apos;s area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1165"/>
+        <source>&amp;Orientation: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1168"/>
+        <source>Vertical</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1169"/>
+        <source>Horizontal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1171"/>
+        <source>Stacking</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1172"/>
+        <source>Keep dock &amp;above other windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1173"/>
+        <source>A&amp;llow dock to be both above and below windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1174"/>
+        <source>Keep dock &amp;below other windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1175"/>
+        <source>Hiding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1176"/>
+        <source>&amp;Delay before hiding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1177"/>
+        <source>Delay before &amp;showing:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1178"/>
+        <source>&amp;Hide off screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1179"/>
         <source>About</source>
         <translation>Tentang</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="853"/>
+        <location filename="../../build/src/ui_obconf.h" line="1036"/>
         <source>&amp;Install a new theme...</source>
         <translation>&amp;Pasang tema baru...</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="854"/>
+        <location filename="../../build/src/ui_obconf.h" line="1037"/>
         <source>Create a theme &amp;archive (.obt)...</source>
         <translation>Buat suatu &amp;arsip tema (.obt)...</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="856"/>
+        <location filename="../../build/src/ui_obconf.h" line="1039"/>
         <source>&amp;Windows retain a border when undecorated</source>
         <translation>&amp;Jendela mempertahankan perbatasan ketika tak didekorasi</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="857"/>
+        <location filename="../../build/src/ui_obconf.h" line="1040"/>
         <source>A&amp;nimate iconify and restore</source>
         <translation>A&amp;nimasikan menjadi ikon dan memulihkan</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="873"/>
+        <location filename="../../build/src/ui_obconf.h" line="1056"/>
         <source>&amp;Active window title: </source>
         <translation>Judul jendela &amp;aktif: </translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="874"/>
+        <location filename="../../build/src/ui_obconf.h" line="1057"/>
         <source>&amp;Inactive window title: </source>
         <translation>Judul jendela tak akt&amp;if: </translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="875"/>
+        <location filename="../../build/src/ui_obconf.h" line="1058"/>
         <source>Menu &amp;header: </source>
         <translation>&amp;Header menu: </translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="876"/>
+        <location filename="../../build/src/ui_obconf.h" line="1059"/>
         <source>&amp;Menu Item: </source>
         <translation>Butir &amp;Menu: </translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="877"/>
+        <location filename="../../build/src/ui_obconf.h" line="1060"/>
         <source>Active &amp;On-screen display: </source>
         <translation>Tampilan Pada layar yang aktif: </translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="878"/>
+        <location filename="../../build/src/ui_obconf.h" line="1061"/>
         <source>Inactive O&amp;n-screen display: </source>
         <translation>Tampilan Pada layar yang tak aktif: </translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="879"/>
+        <location filename="../../build/src/ui_obconf.h" line="1062"/>
         <source>Focus &amp;new windows when they appear</source>
         <translation>Fokus ke je&amp;ndela baru ketika mereka muncul</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="880"/>
+        <location filename="../../build/src/ui_obconf.h" line="1063"/>
         <source>&amp;Place new windows under the mouse pointer</source>
         <translation>Tem&amp;patkan jendela baru di bawah penunjuk tetikus</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="881"/>
+        <location filename="../../build/src/ui_obconf.h" line="1064"/>
         <source>&amp;Center new windows when they are placed</source>
         <translation>Rata &amp;tengahkan jendela baru ketika mereka ditempatkan</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="882"/>
+        <location filename="../../build/src/ui_obconf.h" line="1065"/>
         <source>Prefer to place new windows &amp;on:</source>
         <translation>Lebih suka menempatkan jendela baru p&amp;ada:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="892"/>
+        <location filename="../../build/src/ui_obconf.h" line="1075"/>
         <source>Primary &amp;monitor:</source>
         <translation>&amp;Monitor primer:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="899"/>
+        <location filename="../../build/src/ui_obconf.h" line="1082"/>
         <source>&amp;Fixed monitor:</source>
         <translation>Monitor &amp;tetap:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="901"/>
+        <location filename="../../build/src/ui_obconf.h" line="1084"/>
         <source>Update the window contents while &amp;resizing</source>
         <translation>Mutakhirkan isi jendela ketika mengubah uku&amp;ran</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="902"/>
+        <location filename="../../build/src/ui_obconf.h" line="1085"/>
         <source>Drag &amp;threshold distance:</source>
         <translation>Jarak ambang sere&amp;t:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="903"/>
+        <location filename="../../build/src/ui_obconf.h" line="1086"/>
         <source>Amount of resistance against other &amp;windows:</source>
         <translation>Banyaknya resistansi terhadap &amp;jendela lain:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="904"/>
+        <location filename="../../build/src/ui_obconf.h" line="1087"/>
         <source>Amount of resistance against screen &amp;edges:</source>
         <translation>Banyaknya resistansi terhadap t&amp;epi layar:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="905"/>
+        <location filename="../../build/src/ui_obconf.h" line="1088"/>
         <source>&amp;Amount of time to wait before switching:</source>
         <translation>L&amp;ama waktu tunggu sebelum bertukar:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="906"/>
+        <location filename="../../build/src/ui_obconf.h" line="1089"/>
         <source>&amp;Switch desktops when moving a window past the screen edge</source>
         <translation>Berpindah de&amp;sktop ketika memindahkan suatu jendela melampai tepi layar</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="914"/>
+        <location filename="../../build/src/ui_obconf.h" line="1097"/>
         <source>Fixed &amp;y position:</source>
         <translation>Posisi &amp;y tetap:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="921"/>
+        <location filename="../../build/src/ui_obconf.h" line="1104"/>
         <source>Information dialog&apos;s &amp;position:</source>
         <translation>&amp;Posisi dialog informasi:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="922"/>
+        <location filename="../../build/src/ui_obconf.h" line="1105"/>
         <source>Fixed &amp;x position:</source>
         <translation>Posisi &amp;x tetap:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="923"/>
+        <location filename="../../build/src/ui_obconf.h" line="1106"/>
         <source>Show &amp;information dialog:</source>
         <translation>Tampilkan dialog &amp;informasi:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="938"/>
+        <location filename="../../build/src/ui_obconf.h" line="1121"/>
         <source>&amp;Delay before focusing and raising windows:</source>
         <translation>Tun&amp;daan sebelum memfokus dan menaikkan jendela: </translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="939"/>
+        <location filename="../../build/src/ui_obconf.h" line="1122"/>
         <source>Move focus under the mouse when &amp;switching desktops</source>
         <translation>Pindahkan fokus di bawah tetikus ketika bertukar de&amp;sktop</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="940"/>
+        <location filename="../../build/src/ui_obconf.h" line="1123"/>
         <source>Move focus &amp;under the mouse when the mouse is not moving</source>
         <translation>Pindahkan fok&amp;us ke bawah tetikus ketika tetikus tak bergerak</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="941"/>
+        <location filename="../../build/src/ui_obconf.h" line="1124"/>
         <source>&amp;Raise windows when the mouse pointer moves over them</source>
         <translation>Naikkan jendela ketika penunjuk tetikus berge&amp;rak di atasnya</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="943"/>
+        <location filename="../../build/src/ui_obconf.h" line="1126"/>
         <source>Double click on the &amp;titlebar:</source>
         <translation>Klik ganda pada bilah &amp;judul:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="949"/>
+        <location filename="../../build/src/ui_obconf.h" line="1132"/>
         <source>Double click ti&amp;me:</source>
         <translation>Waktu klik ga&amp;nda:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="950"/>
+        <location filename="../../build/src/ui_obconf.h" line="1133"/>
         <source>&amp;Show a notification when switching desktops</source>
         <translation>Tampilkan pemberitahuan ketika bertukar de&amp;sktop</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="951"/>
+        <location filename="../../build/src/ui_obconf.h" line="1134"/>
         <source>&amp;Amount of time to show the notification for:</source>
         <translation>L&amp;amanya menampilkan pemberitahuan:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="952"/>
+        <location filename="../../build/src/ui_obconf.h" line="1135"/>
         <source>&amp;Number of desktops: </source>
         <translation>Ba&amp;nyaknya desktop: </translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="953"/>
+        <location filename="../../build/src/ui_obconf.h" line="1136"/>
         <source>&amp;Desktop names:</source>
         <translation>Nama &amp;desktop:</translation>
     </message>
@@ -462,8 +592,9 @@ D: Selalu ada (Pada semua desktop)</translation>
         <translation>Aksi gubahan</translation>
     </message>
     <message>
-        <location filename="../desktops.cpp" line="152"/>
-        <location filename="../desktops.cpp" line="162"/>
+        <location filename="../desktops.cpp" line="65"/>
+        <location filename="../desktops.cpp" line="87"/>
+        <location filename="../desktops.cpp" line="99"/>
         <source>(Unnamed desktop)</source>
         <translation>(Desktop tanpa nama)</translation>
     </message>
@@ -476,6 +607,20 @@ D: Selalu ada (Pada semua desktop)</translation>
         <location filename="../maindialog.cpp" line="77"/>
         <source>A preferences manager for Openbox
 
+Copyright (c) 2014-2015
+
+Authors:
+* Hong Jen Yee (PCMan) &lt;pcman.tw@gmail.com&gt;
+
+The program is based on ObConf developed by the following developers.
+* Dana Jansens &lt;danakj@orodu.net&gt;
+* Tim Riley &lt;tr@slackzone.org&gt;
+* Javeed Shaikh &lt;syscrash2k@gmail.com&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A preferences manager for Openbox
+
 Copyright (c) 2003-2013
 
 Authors:
@@ -483,7 +628,7 @@ Authors:
 * Dana Jansens &lt;danakj@orodu.net&gt;
 * Tim Riley &lt;tr@slackzone.org&gt;
 * Javeed Shaikh &lt;syscrash2k@gmail.com&gt;</source>
-        <translation>Manajer preferensi untuk Openbox
+        <translation type="vanished">Manajer preferensi untuk Openbox
 
 Hak cipta (c) 2003-2013
 

src/translations/obconf-qt_is.ts

@@ -17,237 +17,237 @@
 <context>
     <name>MainDialog</name>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="844"/>
+        <location filename="../../build/src/ui_obconf.h" line="1027"/>
         <source>Mouse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="829"/>
+        <location filename="../../build/src/ui_obconf.h" line="1012"/>
         <source>Window Manager Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="834"/>
+        <location filename="../../build/src/ui_obconf.h" line="1017"/>
         <source>Theme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="836"/>
+        <location filename="../../build/src/ui_obconf.h" line="1019"/>
         <source>Appearance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="838"/>
+        <location filename="../../build/src/ui_obconf.h" line="1021"/>
         <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"/>
+        <location filename="../../build/src/ui_obconf.h" line="1023"/>
+        <location filename="../../build/src/ui_obconf.h" line="1038"/>
         <source>Windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="842"/>
+        <location filename="../../build/src/ui_obconf.h" line="1025"/>
         <source>Move &amp; Resize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="846"/>
+        <location filename="../../build/src/ui_obconf.h" line="1029"/>
         <source>Desktops</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="848"/>
+        <location filename="../../build/src/ui_obconf.h" line="1031"/>
         <source>Margins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="850"/>
+        <location filename="../../build/src/ui_obconf.h" line="1033"/>
         <source>Dock</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="858"/>
+        <location filename="../../build/src/ui_obconf.h" line="1041"/>
         <source>Window Titles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="859"/>
+        <location filename="../../build/src/ui_obconf.h" line="1042"/>
         <source>Button order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="900"/>
+        <location filename="../../build/src/ui_obconf.h" line="1083"/>
         <source>Moving and Resizing Windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="907"/>
+        <location filename="../../build/src/ui_obconf.h" line="1090"/>
         <source>Information Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="936"/>
+        <location filename="../../build/src/ui_obconf.h" line="1119"/>
         <source>Focusing Windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="937"/>
+        <location filename="../../build/src/ui_obconf.h" line="1120"/>
         <source>Focus windows when the mouse pointer moves over them</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="942"/>
+        <location filename="../../build/src/ui_obconf.h" line="1125"/>
         <source>Titlebar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="954"/>
+        <location filename="../../build/src/ui_obconf.h" line="1137"/>
         <source>Desktop Margins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="955"/>
+        <location filename="../../build/src/ui_obconf.h" line="1138"/>
         <source>Desktop margins are reserved areas on the edge of your screen.  New windows will not be placed within a margin, and maximized windows will not cover them.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="956"/>
+        <location filename="../../build/src/ui_obconf.h" line="1139"/>
         <source>Left:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="957"/>
-        <location filename="../../build/src/ui_obconf.h" line="959"/>
-        <location filename="../../build/src/ui_obconf.h" line="961"/>
-        <location filename="../../build/src/ui_obconf.h" line="963"/>
+        <location filename="../../build/src/ui_obconf.h" line="1140"/>
+        <location filename="../../build/src/ui_obconf.h" line="1142"/>
+        <location filename="../../build/src/ui_obconf.h" line="1144"/>
+        <location filename="../../build/src/ui_obconf.h" line="1146"/>
         <source>px</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="958"/>
+        <location filename="../../build/src/ui_obconf.h" line="1141"/>
         <source>Top:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="960"/>
+        <location filename="../../build/src/ui_obconf.h" line="1143"/>
         <source>Right:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="962"/>
+        <location filename="../../build/src/ui_obconf.h" line="1145"/>
         <source>Bottom:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="885"/>
+        <location filename="../../build/src/ui_obconf.h" line="1068"/>
         <source>All monitors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="886"/>
+        <location filename="../../build/src/ui_obconf.h" line="1069"/>
         <source>The active monitor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="887"/>
+        <location filename="../../build/src/ui_obconf.h" line="1070"/>
         <source>The monitor with the mouse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="890"/>
+        <location filename="../../build/src/ui_obconf.h" line="1073"/>
         <source>Primary Monitor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="891"/>
+        <location filename="../../build/src/ui_obconf.h" line="1074"/>
         <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="895"/>
+        <location filename="../../build/src/ui_obconf.h" line="1078"/>
         <source>Fixed Monitor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="896"/>
+        <location filename="../../build/src/ui_obconf.h" line="1079"/>
         <source>Active Monitor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="897"/>
+        <location filename="../../build/src/ui_obconf.h" line="1080"/>
         <source>Monitor With Mouse Pointer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="910"/>
-        <location filename="../../build/src/ui_obconf.h" line="917"/>
+        <location filename="../../build/src/ui_obconf.h" line="1093"/>
+        <location filename="../../build/src/ui_obconf.h" line="1100"/>
         <source>Centered</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="911"/>
+        <location filename="../../build/src/ui_obconf.h" line="1094"/>
         <source>From left edge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="912"/>
+        <location filename="../../build/src/ui_obconf.h" line="1095"/>
         <source>From right edge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="918"/>
+        <location filename="../../build/src/ui_obconf.h" line="1101"/>
         <source>From top edge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="919"/>
+        <location filename="../../build/src/ui_obconf.h" line="1102"/>
         <source>From bottom edge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="926"/>
+        <location filename="../../build/src/ui_obconf.h" line="1109"/>
         <source>When resizing terminal windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="927"/>
+        <location filename="../../build/src/ui_obconf.h" line="1110"/>
         <source>Always</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="928"/>
+        <location filename="../../build/src/ui_obconf.h" line="1111"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="932"/>
+        <location filename="../../build/src/ui_obconf.h" line="1115"/>
         <source>Centered on the window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="933"/>
+        <location filename="../../build/src/ui_obconf.h" line="1116"/>
         <source>Above the window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="934"/>
+        <location filename="../../build/src/ui_obconf.h" line="1117"/>
         <source>Fixed position on screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="946"/>
+        <location filename="../../build/src/ui_obconf.h" line="1129"/>
         <source>Maximizes the window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="947"/>
+        <location filename="../../build/src/ui_obconf.h" line="1130"/>
         <source>Shades the window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="860"/>
+        <location filename="../../build/src/ui_obconf.h" line="1043"/>
         <source>N: Window icon
 L: Window label (Title)
 I: Iconify (Minimize)
@@ -258,192 +258,322 @@ D: Omnipresent (On all desktops)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="888"/>
+        <location filename="../../build/src/ui_obconf.h" line="1071"/>
         <source>Primary monitor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="964"/>
+        <location filename="../../build/src/ui_obconf.h" line="1147"/>
+        <source>The dock is a special container for &quot;dockapps&quot;, or dock applications.  It is not visible on screen until a dockapp is run.  Dockapps can be used to show things like a clock, or to provide you with a system tray.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1148"/>
+        <source>Position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1149"/>
+        <source>&amp;Position:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1152"/>
+        <source>Top Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1153"/>
+        <source>Top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1154"/>
+        <source>Top Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1155"/>
+        <source>Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1156"/>
+        <source>Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1157"/>
+        <source>Bottom Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1158"/>
+        <source>Bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1159"/>
+        <source>Bottom Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1160"/>
+        <source>Floating</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1162"/>
+        <source>&amp;Floating position:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1163"/>
+        <source>x</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1164"/>
+        <source>Allow &amp;windows to be placed within the dock&apos;s area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1165"/>
+        <source>&amp;Orientation: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1168"/>
+        <source>Vertical</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1169"/>
+        <source>Horizontal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1171"/>
+        <source>Stacking</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1172"/>
+        <source>Keep dock &amp;above other windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1173"/>
+        <source>A&amp;llow dock to be both above and below windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1174"/>
+        <source>Keep dock &amp;below other windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1175"/>
+        <source>Hiding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1176"/>
+        <source>&amp;Delay before hiding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1177"/>
+        <source>Delay before &amp;showing:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1178"/>
+        <source>&amp;Hide off screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1179"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="853"/>
+        <location filename="../../build/src/ui_obconf.h" line="1036"/>
         <source>&amp;Install a new theme...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="854"/>
+        <location filename="../../build/src/ui_obconf.h" line="1037"/>
         <source>Create a theme &amp;archive (.obt)...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="856"/>
+        <location filename="../../build/src/ui_obconf.h" line="1039"/>
         <source>&amp;Windows retain a border when undecorated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="857"/>
+        <location filename="../../build/src/ui_obconf.h" line="1040"/>
         <source>A&amp;nimate iconify and restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="873"/>
+        <location filename="../../build/src/ui_obconf.h" line="1056"/>
         <source>&amp;Active window title: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="874"/>
+        <location filename="../../build/src/ui_obconf.h" line="1057"/>
         <source>&amp;Inactive window title: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="875"/>
+        <location filename="../../build/src/ui_obconf.h" line="1058"/>
         <source>Menu &amp;header: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="876"/>
+        <location filename="../../build/src/ui_obconf.h" line="1059"/>
         <source>&amp;Menu Item: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="877"/>
+        <location filename="../../build/src/ui_obconf.h" line="1060"/>
         <source>Active &amp;On-screen display: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="878"/>
+        <location filename="../../build/src/ui_obconf.h" line="1061"/>
         <source>Inactive O&amp;n-screen display: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="879"/>
+        <location filename="../../build/src/ui_obconf.h" line="1062"/>
         <source>Focus &amp;new windows when they appear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="880"/>
+        <location filename="../../build/src/ui_obconf.h" line="1063"/>
         <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"/>
+        <location filename="../../build/src/ui_obconf.h" line="1064"/>
         <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"/>
+        <location filename="../../build/src/ui_obconf.h" line="1065"/>
         <source>Prefer to place new windows &amp;on:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="892"/>
+        <location filename="../../build/src/ui_obconf.h" line="1075"/>
         <source>Primary &amp;monitor:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="899"/>
+        <location filename="../../build/src/ui_obconf.h" line="1082"/>
         <source>&amp;Fixed monitor:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="901"/>
+        <location filename="../../build/src/ui_obconf.h" line="1084"/>
         <source>Update the window contents while &amp;resizing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="902"/>
+        <location filename="../../build/src/ui_obconf.h" line="1085"/>
         <source>Drag &amp;threshold distance:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="903"/>
+        <location filename="../../build/src/ui_obconf.h" line="1086"/>
         <source>Amount of resistance against other &amp;windows:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="904"/>
+        <location filename="../../build/src/ui_obconf.h" line="1087"/>
         <source>Amount of resistance against screen &amp;edges:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="905"/>
+        <location filename="../../build/src/ui_obconf.h" line="1088"/>
         <source>&amp;Amount of time to wait before switching:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="906"/>
+        <location filename="../../build/src/ui_obconf.h" line="1089"/>
         <source>&amp;Switch desktops when moving a window past the screen edge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="914"/>
+        <location filename="../../build/src/ui_obconf.h" line="1097"/>
         <source>Fixed &amp;y position:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="921"/>
+        <location filename="../../build/src/ui_obconf.h" line="1104"/>
         <source>Information dialog&apos;s &amp;position:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="922"/>
+        <location filename="../../build/src/ui_obconf.h" line="1105"/>
         <source>Fixed &amp;x position:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="923"/>
+        <location filename="../../build/src/ui_obconf.h" line="1106"/>
         <source>Show &amp;information dialog:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="938"/>
+        <location filename="../../build/src/ui_obconf.h" line="1121"/>
         <source>&amp;Delay before focusing and raising windows:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="939"/>
+        <location filename="../../build/src/ui_obconf.h" line="1122"/>
         <source>Move focus under the mouse when &amp;switching desktops</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="940"/>
+        <location filename="../../build/src/ui_obconf.h" line="1123"/>
         <source>Move focus &amp;under the mouse when the mouse is not moving</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="941"/>
+        <location filename="../../build/src/ui_obconf.h" line="1124"/>
         <source>&amp;Raise windows when the mouse pointer moves over them</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="943"/>
+        <location filename="../../build/src/ui_obconf.h" line="1126"/>
         <source>Double click on the &amp;titlebar:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="949"/>
+        <location filename="../../build/src/ui_obconf.h" line="1132"/>
         <source>Double click ti&amp;me:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="950"/>
+        <location filename="../../build/src/ui_obconf.h" line="1133"/>
         <source>&amp;Show a notification when switching desktops</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="951"/>
+        <location filename="../../build/src/ui_obconf.h" line="1134"/>
         <source>&amp;Amount of time to show the notification for:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="952"/>
+        <location filename="../../build/src/ui_obconf.h" line="1135"/>
         <source>&amp;Number of desktops: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="953"/>
+        <location filename="../../build/src/ui_obconf.h" line="1136"/>
         <source>&amp;Desktop names:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -456,8 +586,9 @@ D: Omnipresent (On all desktops)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../desktops.cpp" line="152"/>
-        <location filename="../desktops.cpp" line="162"/>
+        <location filename="../desktops.cpp" line="65"/>
+        <location filename="../desktops.cpp" line="87"/>
+        <location filename="../desktops.cpp" line="99"/>
         <source>(Unnamed desktop)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -470,10 +601,12 @@ D: Omnipresent (On all desktops)</source>
         <location filename="../maindialog.cpp" line="77"/>
         <source>A preferences manager for Openbox
 
-Copyright (c) 2003-2013
+Copyright (c) 2014-2015
 
 Authors:
 * Hong Jen Yee (PCMan) &lt;pcman.tw@gmail.com&gt;
+
+The program is based on ObConf developed by the following developers.
 * Dana Jansens &lt;danakj@orodu.net&gt;
 * Tim Riley &lt;tr@slackzone.org&gt;
 * Javeed Shaikh &lt;syscrash2k@gmail.com&gt;</source>

src/translations/obconf-qt_ja.ts

@@ -17,237 +17,237 @@
 <context>
     <name>MainDialog</name>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="844"/>
+        <location filename="../../build/src/ui_obconf.h" line="1027"/>
         <source>Mouse</source>
         <translation>マウス</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="829"/>
+        <location filename="../../build/src/ui_obconf.h" line="1012"/>
         <source>Window Manager Preferences</source>
         <translation>ウィンドウマネージャの設定</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="834"/>
+        <location filename="../../build/src/ui_obconf.h" line="1017"/>
         <source>Theme</source>
         <translation>テーマ</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="836"/>
+        <location filename="../../build/src/ui_obconf.h" line="1019"/>
         <source>Appearance</source>
         <translation>外観</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="838"/>
+        <location filename="../../build/src/ui_obconf.h" line="1021"/>
         <source>Font</source>
         <translation>フォント</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="840"/>
-        <location filename="../../build/src/ui_obconf.h" line="855"/>
+        <location filename="../../build/src/ui_obconf.h" line="1023"/>
+        <location filename="../../build/src/ui_obconf.h" line="1038"/>
         <source>Windows</source>
         <translation>ウィンドウ</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="842"/>
+        <location filename="../../build/src/ui_obconf.h" line="1025"/>
         <source>Move &amp; Resize</source>
         <translation>移動 &amp; リサイズ</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="846"/>
+        <location filename="../../build/src/ui_obconf.h" line="1029"/>
         <source>Desktops</source>
         <translation>デスクトップ</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="848"/>
+        <location filename="../../build/src/ui_obconf.h" line="1031"/>
         <source>Margins</source>
         <translation>余白</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="850"/>
+        <location filename="../../build/src/ui_obconf.h" line="1033"/>
         <source>Dock</source>
         <translation>ドック</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="858"/>
+        <location filename="../../build/src/ui_obconf.h" line="1041"/>
         <source>Window Titles</source>
         <translation>ウィンドウのタイトル</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="859"/>
+        <location filename="../../build/src/ui_obconf.h" line="1042"/>
         <source>Button order:</source>
         <translation>ボタンの並び順:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="900"/>
+        <location filename="../../build/src/ui_obconf.h" line="1083"/>
         <source>Moving and Resizing Windows</source>
         <translation>ウィンドウの移動とリサイズ</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="907"/>
+        <location filename="../../build/src/ui_obconf.h" line="1090"/>
         <source>Information Dialog</source>
         <translation>情報ダイアログ</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="936"/>
+        <location filename="../../build/src/ui_obconf.h" line="1119"/>
         <source>Focusing Windows</source>
         <translation>ウィンドウのフォーカス</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="937"/>
+        <location filename="../../build/src/ui_obconf.h" line="1120"/>
         <source>Focus windows when the mouse pointer moves over them</source>
         <translation>マウスポインターが入った時、そのウィンドウをフォーカスする</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="942"/>
+        <location filename="../../build/src/ui_obconf.h" line="1125"/>
         <source>Titlebar</source>
         <translation>タイトルバー</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="954"/>
+        <location filename="../../build/src/ui_obconf.h" line="1137"/>
         <source>Desktop Margins</source>
         <translation>デスクトップの余白</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="955"/>
+        <location filename="../../build/src/ui_obconf.h" line="1138"/>
         <source>Desktop margins are reserved areas on the edge of your screen.  New windows will not be placed within a margin, and maximized windows will not cover them.</source>
         <translation>デスクトップの余白とは、画面の端に予約された領域のことです。新規ウィンドウは余白の上に置かれることはなく、最大化されたウィンドウがそこに被さる事はありません。</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="956"/>
+        <location filename="../../build/src/ui_obconf.h" line="1139"/>
         <source>Left:</source>
         <translation>左:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="957"/>
-        <location filename="../../build/src/ui_obconf.h" line="959"/>
-        <location filename="../../build/src/ui_obconf.h" line="961"/>
-        <location filename="../../build/src/ui_obconf.h" line="963"/>
+        <location filename="../../build/src/ui_obconf.h" line="1140"/>
+        <location filename="../../build/src/ui_obconf.h" line="1142"/>
+        <location filename="../../build/src/ui_obconf.h" line="1144"/>
+        <location filename="../../build/src/ui_obconf.h" line="1146"/>
         <source>px</source>
         <translation>ピクセル</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="958"/>
+        <location filename="../../build/src/ui_obconf.h" line="1141"/>
         <source>Top:</source>
         <translation>上:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="960"/>
+        <location filename="../../build/src/ui_obconf.h" line="1143"/>
         <source>Right:</source>
         <translation>右:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="962"/>
+        <location filename="../../build/src/ui_obconf.h" line="1145"/>
         <source>Bottom:</source>
         <translation>下:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="885"/>
+        <location filename="../../build/src/ui_obconf.h" line="1068"/>
         <source>All monitors</source>
         <translation>全てのモニター</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="886"/>
+        <location filename="../../build/src/ui_obconf.h" line="1069"/>
         <source>The active monitor</source>
         <translation>アクティブなモニター</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="887"/>
+        <location filename="../../build/src/ui_obconf.h" line="1070"/>
         <source>The monitor with the mouse</source>
         <translation>マウスのあるモニター</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="890"/>
+        <location filename="../../build/src/ui_obconf.h" line="1073"/>
         <source>Primary Monitor</source>
         <translation>主モニター</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="891"/>
+        <location filename="../../build/src/ui_obconf.h" line="1074"/>
         <source>The primary monitor is where Openbox will place dialogs, such as the one used for cycling windows.</source>
         <translation>主モニターとは Openbox がウィンドウの循環などのダイアログを配置するモニターです。</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="895"/>
+        <location filename="../../build/src/ui_obconf.h" line="1078"/>
         <source>Fixed Monitor</source>
         <translation>固定モニター</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="896"/>
+        <location filename="../../build/src/ui_obconf.h" line="1079"/>
         <source>Active Monitor</source>
         <translation>アクティブなモニター</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="897"/>
+        <location filename="../../build/src/ui_obconf.h" line="1080"/>
         <source>Monitor With Mouse Pointer</source>
         <translation>マウスポインターのあるモニター</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="910"/>
-        <location filename="../../build/src/ui_obconf.h" line="917"/>
+        <location filename="../../build/src/ui_obconf.h" line="1093"/>
+        <location filename="../../build/src/ui_obconf.h" line="1100"/>
         <source>Centered</source>
         <translation>中央</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="911"/>
+        <location filename="../../build/src/ui_obconf.h" line="1094"/>
         <source>From left edge</source>
         <translation>左端から</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="912"/>
+        <location filename="../../build/src/ui_obconf.h" line="1095"/>
         <source>From right edge</source>
         <translation>右端から</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="918"/>
+        <location filename="../../build/src/ui_obconf.h" line="1101"/>
         <source>From top edge</source>
         <translation>上端から</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="919"/>
+        <location filename="../../build/src/ui_obconf.h" line="1102"/>
         <source>From bottom edge</source>
         <translation>下端から</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="926"/>
+        <location filename="../../build/src/ui_obconf.h" line="1109"/>
         <source>When resizing terminal windows</source>
         <translation>端末ウィンドウをリサイズするとき</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="927"/>
+        <location filename="../../build/src/ui_obconf.h" line="1110"/>
         <source>Always</source>
         <translation>常に</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="928"/>
+        <location filename="../../build/src/ui_obconf.h" line="1111"/>
         <source>Never</source>
         <translation>しない</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="932"/>
+        <location filename="../../build/src/ui_obconf.h" line="1115"/>
         <source>Centered on the window</source>
         <translation>ウィンドウの中央に</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="933"/>
+        <location filename="../../build/src/ui_obconf.h" line="1116"/>
         <source>Above the window</source>
         <translation>ウィンドウの上に</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="934"/>
+        <location filename="../../build/src/ui_obconf.h" line="1117"/>
         <source>Fixed position on screen</source>
         <translation>画面の固定位置に</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="946"/>
+        <location filename="../../build/src/ui_obconf.h" line="1129"/>
         <source>Maximizes the window</source>
         <translation>ウィンドウを最大化する</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="947"/>
+        <location filename="../../build/src/ui_obconf.h" line="1130"/>
         <source>Shades the window</source>
         <translation>ウィンドウをシェード化する</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="860"/>
+        <location filename="../../build/src/ui_obconf.h" line="1043"/>
         <source>N: Window icon
 L: Window label (Title)
 I: Iconify (Minimize)
@@ -264,192 +264,322 @@ S: シェード化 (巻き上げる)
 D: 全てのデスクトップに表示する</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="888"/>
+        <location filename="../../build/src/ui_obconf.h" line="1071"/>
         <source>Primary monitor</source>
         <translation>主モニター</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="964"/>
+        <location filename="../../build/src/ui_obconf.h" line="1147"/>
+        <source>The dock is a special container for &quot;dockapps&quot;, or dock applications.  It is not visible on screen until a dockapp is run.  Dockapps can be used to show things like a clock, or to provide you with a system tray.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1148"/>
+        <source>Position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1149"/>
+        <source>&amp;Position:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1152"/>
+        <source>Top Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1153"/>
+        <source>Top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1154"/>
+        <source>Top Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1155"/>
+        <source>Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1156"/>
+        <source>Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1157"/>
+        <source>Bottom Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1158"/>
+        <source>Bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1159"/>
+        <source>Bottom Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1160"/>
+        <source>Floating</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1162"/>
+        <source>&amp;Floating position:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1163"/>
+        <source>x</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1164"/>
+        <source>Allow &amp;windows to be placed within the dock&apos;s area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1165"/>
+        <source>&amp;Orientation: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1168"/>
+        <source>Vertical</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1169"/>
+        <source>Horizontal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1171"/>
+        <source>Stacking</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1172"/>
+        <source>Keep dock &amp;above other windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1173"/>
+        <source>A&amp;llow dock to be both above and below windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1174"/>
+        <source>Keep dock &amp;below other windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1175"/>
+        <source>Hiding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1176"/>
+        <source>&amp;Delay before hiding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1177"/>
+        <source>Delay before &amp;showing:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1178"/>
+        <source>&amp;Hide off screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1179"/>
         <source>About</source>
         <translation>このアプリケーションについて</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="853"/>
+        <location filename="../../build/src/ui_obconf.h" line="1036"/>
         <source>&amp;Install a new theme...</source>
         <translation>新規テーマのインストール(&amp;I)...</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="854"/>
+        <location filename="../../build/src/ui_obconf.h" line="1037"/>
         <source>Create a theme &amp;archive (.obt)...</source>
         <translation>テーマアーカイブ (.obt)の作成(&amp;A)...</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="856"/>
+        <location filename="../../build/src/ui_obconf.h" line="1039"/>
         <source>&amp;Windows retain a border when undecorated</source>
         <translation>ウィンドウ装飾が外されても枠は維持する(&amp;W)</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="857"/>
+        <location filename="../../build/src/ui_obconf.h" line="1040"/>
         <source>A&amp;nimate iconify and restore</source>
         <translation>アイコン化と復帰をアニメーションする(&amp;N)</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="873"/>
+        <location filename="../../build/src/ui_obconf.h" line="1056"/>
         <source>&amp;Active window title: </source>
         <translation>アクティブなウィンドウのタイトル(&amp;A): </translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="874"/>
+        <location filename="../../build/src/ui_obconf.h" line="1057"/>
         <source>&amp;Inactive window title: </source>
         <translation>非アクティブなウィンドウのタイトル(&amp;I): </translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="875"/>
+        <location filename="../../build/src/ui_obconf.h" line="1058"/>
         <source>Menu &amp;header: </source>
         <translation>メニューのヘッダ(&amp;H): </translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="876"/>
+        <location filename="../../build/src/ui_obconf.h" line="1059"/>
         <source>&amp;Menu Item: </source>
         <translation>メニューのアイテム(&amp;M): </translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="877"/>
+        <location filename="../../build/src/ui_obconf.h" line="1060"/>
         <source>Active &amp;On-screen display: </source>
         <translation>アクティブなオンスクリーンディスプレイ(&amp;O): </translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="878"/>
+        <location filename="../../build/src/ui_obconf.h" line="1061"/>
         <source>Inactive O&amp;n-screen display: </source>
         <translation>非アクティブなオンスクリーンディスプレイ(&amp;N): </translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="879"/>
+        <location filename="../../build/src/ui_obconf.h" line="1062"/>
         <source>Focus &amp;new windows when they appear</source>
         <translation>新規ウィンドウが現れたときそれをフォーカスする(&amp;N)</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="880"/>
+        <location filename="../../build/src/ui_obconf.h" line="1063"/>
         <source>&amp;Place new windows under the mouse pointer</source>
         <translation>新規ウィンドウはマウスポインタの下に配置する(&amp;P)</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="881"/>
+        <location filename="../../build/src/ui_obconf.h" line="1064"/>
         <source>&amp;Center new windows when they are placed</source>
         <translation>新規ウィンドウは中央に配置する(&amp;C)</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="882"/>
+        <location filename="../../build/src/ui_obconf.h" line="1065"/>
         <source>Prefer to place new windows &amp;on:</source>
         <translation>新規ウィンドウの配置設定(&amp;O):</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="892"/>
+        <location filename="../../build/src/ui_obconf.h" line="1075"/>
         <source>Primary &amp;monitor:</source>
         <translation>主モニター(&amp;M):</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="899"/>
+        <location filename="../../build/src/ui_obconf.h" line="1082"/>
         <source>&amp;Fixed monitor:</source>
         <translation>固定モニター(&amp;F):</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="901"/>
+        <location filename="../../build/src/ui_obconf.h" line="1084"/>
         <source>Update the window contents while &amp;resizing</source>
         <translation>リサイズ中もウィンドウの表示内容を更新する(&amp;R)</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="902"/>
+        <location filename="../../build/src/ui_obconf.h" line="1085"/>
         <source>Drag &amp;threshold distance:</source>
         <translation>ドラッグの閾値となる距離(&amp;T):</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="903"/>
+        <location filename="../../build/src/ui_obconf.h" line="1086"/>
         <source>Amount of resistance against other &amp;windows:</source>
         <translation>他のウィンドウに接した時の抵抗の量(&amp;W):</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="904"/>
+        <location filename="../../build/src/ui_obconf.h" line="1087"/>
         <source>Amount of resistance against screen &amp;edges:</source>
         <translation>画面端に接した時の抵抗の量(&amp;E):</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="905"/>
+        <location filename="../../build/src/ui_obconf.h" line="1088"/>
         <source>&amp;Amount of time to wait before switching:</source>
         <translation>デスクトップを切り替えるまでのウェイト(&amp;A):</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="906"/>
+        <location filename="../../build/src/ui_obconf.h" line="1089"/>
         <source>&amp;Switch desktops when moving a window past the screen edge</source>
         <translation>ウィンドウを画面端の先へ動かそうとした時デスクトップを切り替える(&amp;S)</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="914"/>
+        <location filename="../../build/src/ui_obconf.h" line="1097"/>
         <source>Fixed &amp;y position:</source>
         <translation>固定のY位置(&amp;Y):</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="921"/>
+        <location filename="../../build/src/ui_obconf.h" line="1104"/>
         <source>Information dialog&apos;s &amp;position:</source>
         <translation>情報ダイアログの位置(&amp;P):</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="922"/>
+        <location filename="../../build/src/ui_obconf.h" line="1105"/>
         <source>Fixed &amp;x position:</source>
         <translation>固定のX位置(&amp;X):</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="923"/>
+        <location filename="../../build/src/ui_obconf.h" line="1106"/>
         <source>Show &amp;information dialog:</source>
         <translation>情報ダイアログの表示(&amp;I):</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="938"/>
+        <location filename="../../build/src/ui_obconf.h" line="1121"/>
         <source>&amp;Delay before focusing and raising windows:</source>
         <translation>ウィンドウをフォーカスし前面に出すまでの遅延(&amp;D):</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="939"/>
+        <location filename="../../build/src/ui_obconf.h" line="1122"/>
         <source>Move focus under the mouse when &amp;switching desktops</source>
         <translation>デスクトップを切り替える際にマウスの下にあるウィンドウへフォーカスを移す(&amp;S)</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="940"/>
+        <location filename="../../build/src/ui_obconf.h" line="1123"/>
         <source>Move focus &amp;under the mouse when the mouse is not moving</source>
         <translation>マウスが動いていない時もそこへフォーカスを移す(&amp;U)</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="941"/>
+        <location filename="../../build/src/ui_obconf.h" line="1124"/>
         <source>&amp;Raise windows when the mouse pointer moves over them</source>
         <translation>マウスポインタが入ったウィンドウを前面に出す(&amp;R)</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="943"/>
+        <location filename="../../build/src/ui_obconf.h" line="1126"/>
         <source>Double click on the &amp;titlebar:</source>
         <translation>タイトルバー上のダブルクリック(&amp;T):</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="949"/>
+        <location filename="../../build/src/ui_obconf.h" line="1132"/>
         <source>Double click ti&amp;me:</source>
         <translation>ダブルクリックの時間(&amp;M):</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="950"/>
+        <location filename="../../build/src/ui_obconf.h" line="1133"/>
         <source>&amp;Show a notification when switching desktops</source>
         <translation>デスクトップ切替時に通知を表示する(&amp;S)</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="951"/>
+        <location filename="../../build/src/ui_obconf.h" line="1134"/>
         <source>&amp;Amount of time to show the notification for:</source>
         <translation>通知を表示する時間の長さ(&amp;A):</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="952"/>
+        <location filename="../../build/src/ui_obconf.h" line="1135"/>
         <source>&amp;Number of desktops: </source>
         <translation>デスクトップの数(&amp;N): </translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="953"/>
+        <location filename="../../build/src/ui_obconf.h" line="1136"/>
         <source>&amp;Desktop names:</source>
         <translation>デスクトップの名前(&amp;D):</translation>
     </message>
@@ -462,8 +592,9 @@ D: 全てのデスクトップに表示する</translation>
         <translation>独自のアクション</translation>
     </message>
     <message>
-        <location filename="../desktops.cpp" line="152"/>
-        <location filename="../desktops.cpp" line="162"/>
+        <location filename="../desktops.cpp" line="65"/>
+        <location filename="../desktops.cpp" line="87"/>
+        <location filename="../desktops.cpp" line="99"/>
         <source>(Unnamed desktop)</source>
         <translation>(無題のデスクトップ)</translation>
     </message>
@@ -476,6 +607,20 @@ D: 全てのデスクトップに表示する</translation>
         <location filename="../maindialog.cpp" line="77"/>
         <source>A preferences manager for Openbox
 
+Copyright (c) 2014-2015
+
+Authors:
+* Hong Jen Yee (PCMan) &lt;pcman.tw@gmail.com&gt;
+
+The program is based on ObConf developed by the following developers.
+* Dana Jansens &lt;danakj@orodu.net&gt;
+* Tim Riley &lt;tr@slackzone.org&gt;
+* Javeed Shaikh &lt;syscrash2k@gmail.com&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A preferences manager for Openbox
+
 Copyright (c) 2003-2013
 
 Authors:
@@ -483,7 +628,7 @@ Authors:
 * Dana Jansens &lt;danakj@orodu.net&gt;
 * Tim Riley &lt;tr@slackzone.org&gt;
 * Javeed Shaikh &lt;syscrash2k@gmail.com&gt;</source>
-        <translation>Openbox の設定マネージャ
+        <translation type="vanished">Openbox の設定マネージャ
 
 Copyright (c) 2003-2013
 

src/translations/obconf-qt_pa.ts

@@ -17,237 +17,237 @@
 <context>
     <name>MainDialog</name>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="844"/>
+        <location filename="../../build/src/ui_obconf.h" line="1027"/>
         <source>Mouse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="829"/>
+        <location filename="../../build/src/ui_obconf.h" line="1012"/>
         <source>Window Manager Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="834"/>
+        <location filename="../../build/src/ui_obconf.h" line="1017"/>
         <source>Theme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="836"/>
+        <location filename="../../build/src/ui_obconf.h" line="1019"/>
         <source>Appearance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="838"/>
+        <location filename="../../build/src/ui_obconf.h" line="1021"/>
         <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"/>
+        <location filename="../../build/src/ui_obconf.h" line="1023"/>
+        <location filename="../../build/src/ui_obconf.h" line="1038"/>
         <source>Windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="842"/>
+        <location filename="../../build/src/ui_obconf.h" line="1025"/>
         <source>Move &amp; Resize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="846"/>
+        <location filename="../../build/src/ui_obconf.h" line="1029"/>
         <source>Desktops</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="848"/>
+        <location filename="../../build/src/ui_obconf.h" line="1031"/>
         <source>Margins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="850"/>
+        <location filename="../../build/src/ui_obconf.h" line="1033"/>
         <source>Dock</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="858"/>
+        <location filename="../../build/src/ui_obconf.h" line="1041"/>
         <source>Window Titles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="859"/>
+        <location filename="../../build/src/ui_obconf.h" line="1042"/>
         <source>Button order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="900"/>
+        <location filename="../../build/src/ui_obconf.h" line="1083"/>
         <source>Moving and Resizing Windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="907"/>
+        <location filename="../../build/src/ui_obconf.h" line="1090"/>
         <source>Information Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="936"/>
+        <location filename="../../build/src/ui_obconf.h" line="1119"/>
         <source>Focusing Windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="937"/>
+        <location filename="../../build/src/ui_obconf.h" line="1120"/>
         <source>Focus windows when the mouse pointer moves over them</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="942"/>
+        <location filename="../../build/src/ui_obconf.h" line="1125"/>
         <source>Titlebar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="954"/>
+        <location filename="../../build/src/ui_obconf.h" line="1137"/>
         <source>Desktop Margins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="955"/>
+        <location filename="../../build/src/ui_obconf.h" line="1138"/>
         <source>Desktop margins are reserved areas on the edge of your screen.  New windows will not be placed within a margin, and maximized windows will not cover them.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="956"/>
+        <location filename="../../build/src/ui_obconf.h" line="1139"/>
         <source>Left:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="957"/>
-        <location filename="../../build/src/ui_obconf.h" line="959"/>
-        <location filename="../../build/src/ui_obconf.h" line="961"/>
-        <location filename="../../build/src/ui_obconf.h" line="963"/>
+        <location filename="../../build/src/ui_obconf.h" line="1140"/>
+        <location filename="../../build/src/ui_obconf.h" line="1142"/>
+        <location filename="../../build/src/ui_obconf.h" line="1144"/>
+        <location filename="../../build/src/ui_obconf.h" line="1146"/>
         <source>px</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="958"/>
+        <location filename="../../build/src/ui_obconf.h" line="1141"/>
         <source>Top:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="960"/>
+        <location filename="../../build/src/ui_obconf.h" line="1143"/>
         <source>Right:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="962"/>
+        <location filename="../../build/src/ui_obconf.h" line="1145"/>
         <source>Bottom:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="885"/>
+        <location filename="../../build/src/ui_obconf.h" line="1068"/>
         <source>All monitors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="886"/>
+        <location filename="../../build/src/ui_obconf.h" line="1069"/>
         <source>The active monitor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="887"/>
+        <location filename="../../build/src/ui_obconf.h" line="1070"/>
         <source>The monitor with the mouse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="890"/>
+        <location filename="../../build/src/ui_obconf.h" line="1073"/>
         <source>Primary Monitor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="891"/>
+        <location filename="../../build/src/ui_obconf.h" line="1074"/>
         <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="895"/>
+        <location filename="../../build/src/ui_obconf.h" line="1078"/>
         <source>Fixed Monitor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="896"/>
+        <location filename="../../build/src/ui_obconf.h" line="1079"/>
         <source>Active Monitor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="897"/>
+        <location filename="../../build/src/ui_obconf.h" line="1080"/>
         <source>Monitor With Mouse Pointer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="910"/>
-        <location filename="../../build/src/ui_obconf.h" line="917"/>
+        <location filename="../../build/src/ui_obconf.h" line="1093"/>
+        <location filename="../../build/src/ui_obconf.h" line="1100"/>
         <source>Centered</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="911"/>
+        <location filename="../../build/src/ui_obconf.h" line="1094"/>
         <source>From left edge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="912"/>
+        <location filename="../../build/src/ui_obconf.h" line="1095"/>
         <source>From right edge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="918"/>
+        <location filename="../../build/src/ui_obconf.h" line="1101"/>
         <source>From top edge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="919"/>
+        <location filename="../../build/src/ui_obconf.h" line="1102"/>
         <source>From bottom edge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="926"/>
+        <location filename="../../build/src/ui_obconf.h" line="1109"/>
         <source>When resizing terminal windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="927"/>
+        <location filename="../../build/src/ui_obconf.h" line="1110"/>
         <source>Always</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="928"/>
+        <location filename="../../build/src/ui_obconf.h" line="1111"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="932"/>
+        <location filename="../../build/src/ui_obconf.h" line="1115"/>
         <source>Centered on the window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="933"/>
+        <location filename="../../build/src/ui_obconf.h" line="1116"/>
         <source>Above the window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="934"/>
+        <location filename="../../build/src/ui_obconf.h" line="1117"/>
         <source>Fixed position on screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="946"/>
+        <location filename="../../build/src/ui_obconf.h" line="1129"/>
         <source>Maximizes the window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="947"/>
+        <location filename="../../build/src/ui_obconf.h" line="1130"/>
         <source>Shades the window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="860"/>
+        <location filename="../../build/src/ui_obconf.h" line="1043"/>
         <source>N: Window icon
 L: Window label (Title)
 I: Iconify (Minimize)
@@ -258,192 +258,322 @@ D: Omnipresent (On all desktops)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="888"/>
+        <location filename="../../build/src/ui_obconf.h" line="1071"/>
         <source>Primary monitor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="964"/>
+        <location filename="../../build/src/ui_obconf.h" line="1147"/>
+        <source>The dock is a special container for &quot;dockapps&quot;, or dock applications.  It is not visible on screen until a dockapp is run.  Dockapps can be used to show things like a clock, or to provide you with a system tray.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1148"/>
+        <source>Position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1149"/>
+        <source>&amp;Position:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1152"/>
+        <source>Top Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1153"/>
+        <source>Top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1154"/>
+        <source>Top Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1155"/>
+        <source>Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1156"/>
+        <source>Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1157"/>
+        <source>Bottom Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1158"/>
+        <source>Bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1159"/>
+        <source>Bottom Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1160"/>
+        <source>Floating</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1162"/>
+        <source>&amp;Floating position:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1163"/>
+        <source>x</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1164"/>
+        <source>Allow &amp;windows to be placed within the dock&apos;s area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1165"/>
+        <source>&amp;Orientation: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1168"/>
+        <source>Vertical</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1169"/>
+        <source>Horizontal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1171"/>
+        <source>Stacking</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1172"/>
+        <source>Keep dock &amp;above other windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1173"/>
+        <source>A&amp;llow dock to be both above and below windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1174"/>
+        <source>Keep dock &amp;below other windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1175"/>
+        <source>Hiding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1176"/>
+        <source>&amp;Delay before hiding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1177"/>
+        <source>Delay before &amp;showing:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1178"/>
+        <source>&amp;Hide off screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1179"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="853"/>
+        <location filename="../../build/src/ui_obconf.h" line="1036"/>
         <source>&amp;Install a new theme...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="854"/>
+        <location filename="../../build/src/ui_obconf.h" line="1037"/>
         <source>Create a theme &amp;archive (.obt)...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="856"/>
+        <location filename="../../build/src/ui_obconf.h" line="1039"/>
         <source>&amp;Windows retain a border when undecorated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="857"/>
+        <location filename="../../build/src/ui_obconf.h" line="1040"/>
         <source>A&amp;nimate iconify and restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="873"/>
+        <location filename="../../build/src/ui_obconf.h" line="1056"/>
         <source>&amp;Active window title: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="874"/>
+        <location filename="../../build/src/ui_obconf.h" line="1057"/>
         <source>&amp;Inactive window title: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="875"/>
+        <location filename="../../build/src/ui_obconf.h" line="1058"/>
         <source>Menu &amp;header: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="876"/>
+        <location filename="../../build/src/ui_obconf.h" line="1059"/>
         <source>&amp;Menu Item: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="877"/>
+        <location filename="../../build/src/ui_obconf.h" line="1060"/>
         <source>Active &amp;On-screen display: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="878"/>
+        <location filename="../../build/src/ui_obconf.h" line="1061"/>
         <source>Inactive O&amp;n-screen display: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="879"/>
+        <location filename="../../build/src/ui_obconf.h" line="1062"/>
         <source>Focus &amp;new windows when they appear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="880"/>
+        <location filename="../../build/src/ui_obconf.h" line="1063"/>
         <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"/>
+        <location filename="../../build/src/ui_obconf.h" line="1064"/>
         <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"/>
+        <location filename="../../build/src/ui_obconf.h" line="1065"/>
         <source>Prefer to place new windows &amp;on:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="892"/>
+        <location filename="../../build/src/ui_obconf.h" line="1075"/>
         <source>Primary &amp;monitor:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="899"/>
+        <location filename="../../build/src/ui_obconf.h" line="1082"/>
         <source>&amp;Fixed monitor:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="901"/>
+        <location filename="../../build/src/ui_obconf.h" line="1084"/>
         <source>Update the window contents while &amp;resizing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="902"/>
+        <location filename="../../build/src/ui_obconf.h" line="1085"/>
         <source>Drag &amp;threshold distance:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="903"/>
+        <location filename="../../build/src/ui_obconf.h" line="1086"/>
         <source>Amount of resistance against other &amp;windows:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="904"/>
+        <location filename="../../build/src/ui_obconf.h" line="1087"/>
         <source>Amount of resistance against screen &amp;edges:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="905"/>
+        <location filename="../../build/src/ui_obconf.h" line="1088"/>
         <source>&amp;Amount of time to wait before switching:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="906"/>
+        <location filename="../../build/src/ui_obconf.h" line="1089"/>
         <source>&amp;Switch desktops when moving a window past the screen edge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="914"/>
+        <location filename="../../build/src/ui_obconf.h" line="1097"/>
         <source>Fixed &amp;y position:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="921"/>
+        <location filename="../../build/src/ui_obconf.h" line="1104"/>
         <source>Information dialog&apos;s &amp;position:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="922"/>
+        <location filename="../../build/src/ui_obconf.h" line="1105"/>
         <source>Fixed &amp;x position:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="923"/>
+        <location filename="../../build/src/ui_obconf.h" line="1106"/>
         <source>Show &amp;information dialog:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="938"/>
+        <location filename="../../build/src/ui_obconf.h" line="1121"/>
         <source>&amp;Delay before focusing and raising windows:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="939"/>
+        <location filename="../../build/src/ui_obconf.h" line="1122"/>
         <source>Move focus under the mouse when &amp;switching desktops</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="940"/>
+        <location filename="../../build/src/ui_obconf.h" line="1123"/>
         <source>Move focus &amp;under the mouse when the mouse is not moving</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="941"/>
+        <location filename="../../build/src/ui_obconf.h" line="1124"/>
         <source>&amp;Raise windows when the mouse pointer moves over them</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="943"/>
+        <location filename="../../build/src/ui_obconf.h" line="1126"/>
         <source>Double click on the &amp;titlebar:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="949"/>
+        <location filename="../../build/src/ui_obconf.h" line="1132"/>
         <source>Double click ti&amp;me:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="950"/>
+        <location filename="../../build/src/ui_obconf.h" line="1133"/>
         <source>&amp;Show a notification when switching desktops</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="951"/>
+        <location filename="../../build/src/ui_obconf.h" line="1134"/>
         <source>&amp;Amount of time to show the notification for:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="952"/>
+        <location filename="../../build/src/ui_obconf.h" line="1135"/>
         <source>&amp;Number of desktops: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="953"/>
+        <location filename="../../build/src/ui_obconf.h" line="1136"/>
         <source>&amp;Desktop names:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -456,8 +586,9 @@ D: Omnipresent (On all desktops)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../desktops.cpp" line="152"/>
-        <location filename="../desktops.cpp" line="162"/>
+        <location filename="../desktops.cpp" line="65"/>
+        <location filename="../desktops.cpp" line="87"/>
+        <location filename="../desktops.cpp" line="99"/>
         <source>(Unnamed desktop)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -470,10 +601,12 @@ D: Omnipresent (On all desktops)</source>
         <location filename="../maindialog.cpp" line="77"/>
         <source>A preferences manager for Openbox
 
-Copyright (c) 2003-2013
+Copyright (c) 2014-2015
 
 Authors:
 * Hong Jen Yee (PCMan) &lt;pcman.tw@gmail.com&gt;
+
+The program is based on ObConf developed by the following developers.
 * Dana Jansens &lt;danakj@orodu.net&gt;
 * Tim Riley &lt;tr@slackzone.org&gt;
 * Javeed Shaikh &lt;syscrash2k@gmail.com&gt;</source>

src/translations/obconf-qt_pl.ts

@@ -17,237 +17,237 @@
 <context>
     <name>MainDialog</name>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="844"/>
+        <location filename="../../build/src/ui_obconf.h" line="1027"/>
         <source>Mouse</source>
         <translation>Mysz</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="829"/>
+        <location filename="../../build/src/ui_obconf.h" line="1012"/>
         <source>Window Manager Preferences</source>
         <translation>Preferencje menedżera okien</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="834"/>
+        <location filename="../../build/src/ui_obconf.h" line="1017"/>
         <source>Theme</source>
         <translation>Motyw</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="836"/>
+        <location filename="../../build/src/ui_obconf.h" line="1019"/>
         <source>Appearance</source>
         <translation>Wygląd</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="838"/>
+        <location filename="../../build/src/ui_obconf.h" line="1021"/>
         <source>Font</source>
         <translation>Czcionka</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="840"/>
-        <location filename="../../build/src/ui_obconf.h" line="855"/>
+        <location filename="../../build/src/ui_obconf.h" line="1023"/>
+        <location filename="../../build/src/ui_obconf.h" line="1038"/>
         <source>Windows</source>
         <translation>Okna</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="842"/>
+        <location filename="../../build/src/ui_obconf.h" line="1025"/>
         <source>Move &amp; Resize</source>
         <translation>Przenieś i zmień rozmiar</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="846"/>
+        <location filename="../../build/src/ui_obconf.h" line="1029"/>
         <source>Desktops</source>
         <translation>Pulpity</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="848"/>
+        <location filename="../../build/src/ui_obconf.h" line="1031"/>
         <source>Margins</source>
         <translation>Obrzeża</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="850"/>
+        <location filename="../../build/src/ui_obconf.h" line="1033"/>
         <source>Dock</source>
         <translation>Dok</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="858"/>
+        <location filename="../../build/src/ui_obconf.h" line="1041"/>
         <source>Window Titles</source>
         <translation>Tytuły okien</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="859"/>
+        <location filename="../../build/src/ui_obconf.h" line="1042"/>
         <source>Button order:</source>
         <translation>Kolejność przycisków:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="900"/>
+        <location filename="../../build/src/ui_obconf.h" line="1083"/>
         <source>Moving and Resizing Windows</source>
         <translation>Przenoszenie i zmiana rozmiaru okien</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="907"/>
+        <location filename="../../build/src/ui_obconf.h" line="1090"/>
         <source>Information Dialog</source>
         <translation>Okno dialogowe</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="936"/>
+        <location filename="../../build/src/ui_obconf.h" line="1119"/>
         <source>Focusing Windows</source>
         <translation>Aktywacja okien</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="937"/>
+        <location filename="../../build/src/ui_obconf.h" line="1120"/>
         <source>Focus windows when the mouse pointer moves over them</source>
         <translation>Aktywuj okna, gdy wskaźnik myszy znajduje się nad nimi</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="942"/>
+        <location filename="../../build/src/ui_obconf.h" line="1125"/>
         <source>Titlebar</source>
         <translation>Pasek tytułu</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="954"/>
+        <location filename="../../build/src/ui_obconf.h" line="1137"/>
         <source>Desktop Margins</source>
         <translation>Obrzeża pulpitu</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="955"/>
+        <location filename="../../build/src/ui_obconf.h" line="1138"/>
         <source>Desktop margins are reserved areas on the edge of your screen.  New windows will not be placed within a margin, and maximized windows will not cover them.</source>
         <translation>Obrzeża pulpitu to zarezerwowany obszar na krawędziach Twojego ekranu.  Nowe okna nie będą umieszczane na obrzeżach, a maksymalizowane okna nie będą ich pokrywać.</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="956"/>
+        <location filename="../../build/src/ui_obconf.h" line="1139"/>
         <source>Left:</source>
         <translation>Lewy:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="957"/>
-        <location filename="../../build/src/ui_obconf.h" line="959"/>
-        <location filename="../../build/src/ui_obconf.h" line="961"/>
-        <location filename="../../build/src/ui_obconf.h" line="963"/>
+        <location filename="../../build/src/ui_obconf.h" line="1140"/>
+        <location filename="../../build/src/ui_obconf.h" line="1142"/>
+        <location filename="../../build/src/ui_obconf.h" line="1144"/>
+        <location filename="../../build/src/ui_obconf.h" line="1146"/>
         <source>px</source>
         <translation>piks.</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="958"/>
+        <location filename="../../build/src/ui_obconf.h" line="1141"/>
         <source>Top:</source>
         <translation>Górny:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="960"/>
+        <location filename="../../build/src/ui_obconf.h" line="1143"/>
         <source>Right:</source>
         <translation>Prawy:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="962"/>
+        <location filename="../../build/src/ui_obconf.h" line="1145"/>
         <source>Bottom:</source>
         <translation>Dolny:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="885"/>
+        <location filename="../../build/src/ui_obconf.h" line="1068"/>
         <source>All monitors</source>
         <translation>Wszystkie monitory</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="886"/>
+        <location filename="../../build/src/ui_obconf.h" line="1069"/>
         <source>The active monitor</source>
         <translation>Aktywny monitor</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="887"/>
+        <location filename="../../build/src/ui_obconf.h" line="1070"/>
         <source>The monitor with the mouse</source>
         <translation>Monitor z myszą</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="890"/>
+        <location filename="../../build/src/ui_obconf.h" line="1073"/>
         <source>Primary Monitor</source>
         <translation>Monitor główny</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="891"/>
+        <location filename="../../build/src/ui_obconf.h" line="1074"/>
         <source>The primary monitor is where Openbox will place dialogs, such as the one used for cycling windows.</source>
         <translation>Główny monitor to ten, gdzie Openbox będzie umieszczać okna dialogowe, jak również ten służący do wymiany okien.</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="895"/>
+        <location filename="../../build/src/ui_obconf.h" line="1078"/>
         <source>Fixed Monitor</source>
         <translation>Stały monitor</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="896"/>
+        <location filename="../../build/src/ui_obconf.h" line="1079"/>
         <source>Active Monitor</source>
         <translation>Aktywny monitor</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="897"/>
+        <location filename="../../build/src/ui_obconf.h" line="1080"/>
         <source>Monitor With Mouse Pointer</source>
         <translation>Monitor ze wskaźnikiem myszy</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="910"/>
-        <location filename="../../build/src/ui_obconf.h" line="917"/>
+        <location filename="../../build/src/ui_obconf.h" line="1093"/>
+        <location filename="../../build/src/ui_obconf.h" line="1100"/>
         <source>Centered</source>
         <translation>Wyśrodkowane</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="911"/>
+        <location filename="../../build/src/ui_obconf.h" line="1094"/>
         <source>From left edge</source>
         <translation>Od lewej krawędzi</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="912"/>
+        <location filename="../../build/src/ui_obconf.h" line="1095"/>
         <source>From right edge</source>
         <translation>Od prawej krawędzi</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="918"/>
+        <location filename="../../build/src/ui_obconf.h" line="1101"/>
         <source>From top edge</source>
         <translation>Od górnej krawędzi</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="919"/>
+        <location filename="../../build/src/ui_obconf.h" line="1102"/>
         <source>From bottom edge</source>
         <translation>Od dolnej krawędzi</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="926"/>
+        <location filename="../../build/src/ui_obconf.h" line="1109"/>
         <source>When resizing terminal windows</source>
         <translation>Podczas zmiany rozmiaru okna terminala</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="927"/>
+        <location filename="../../build/src/ui_obconf.h" line="1110"/>
         <source>Always</source>
         <translation>Zawsze</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="928"/>
+        <location filename="../../build/src/ui_obconf.h" line="1111"/>
         <source>Never</source>
         <translation>Nigdy</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="932"/>
+        <location filename="../../build/src/ui_obconf.h" line="1115"/>
         <source>Centered on the window</source>
         <translation>Centralnie na oknie</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="933"/>
+        <location filename="../../build/src/ui_obconf.h" line="1116"/>
         <source>Above the window</source>
         <translation>Nad oknem</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="934"/>
+        <location filename="../../build/src/ui_obconf.h" line="1117"/>
         <source>Fixed position on screen</source>
         <translation>Określone położenie na ekranie</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="946"/>
+        <location filename="../../build/src/ui_obconf.h" line="1129"/>
         <source>Maximizes the window</source>
         <translation>Maksymalizuje okno</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="947"/>
+        <location filename="../../build/src/ui_obconf.h" line="1130"/>
         <source>Shades the window</source>
         <translation>Przyciemnia okno</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="860"/>
+        <location filename="../../build/src/ui_obconf.h" line="1043"/>
         <source>N: Window icon
 L: Window label (Title)
 I: Iconify (Minimize)
@@ -264,192 +264,322 @@ S: Zwiń (Zroluj)
 D: Wszechobecne (Na wszystkich pulpitach)</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="888"/>
+        <location filename="../../build/src/ui_obconf.h" line="1071"/>
         <source>Primary monitor</source>
         <translation>Monitor główny</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="964"/>
+        <location filename="../../build/src/ui_obconf.h" line="1147"/>
+        <source>The dock is a special container for &quot;dockapps&quot;, or dock applications.  It is not visible on screen until a dockapp is run.  Dockapps can be used to show things like a clock, or to provide you with a system tray.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1148"/>
+        <source>Position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1149"/>
+        <source>&amp;Position:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1152"/>
+        <source>Top Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1153"/>
+        <source>Top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1154"/>
+        <source>Top Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1155"/>
+        <source>Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1156"/>
+        <source>Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1157"/>
+        <source>Bottom Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1158"/>
+        <source>Bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1159"/>
+        <source>Bottom Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1160"/>
+        <source>Floating</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1162"/>
+        <source>&amp;Floating position:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1163"/>
+        <source>x</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1164"/>
+        <source>Allow &amp;windows to be placed within the dock&apos;s area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1165"/>
+        <source>&amp;Orientation: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1168"/>
+        <source>Vertical</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1169"/>
+        <source>Horizontal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1171"/>
+        <source>Stacking</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1172"/>
+        <source>Keep dock &amp;above other windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1173"/>
+        <source>A&amp;llow dock to be both above and below windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1174"/>
+        <source>Keep dock &amp;below other windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1175"/>
+        <source>Hiding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1176"/>
+        <source>&amp;Delay before hiding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1177"/>
+        <source>Delay before &amp;showing:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1178"/>
+        <source>&amp;Hide off screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1179"/>
         <source>About</source>
         <translation>O programie</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="853"/>
+        <location filename="../../build/src/ui_obconf.h" line="1036"/>
         <source>&amp;Install a new theme...</source>
         <translation>&amp;Zainstaluj nowy motyw...</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="854"/>
+        <location filename="../../build/src/ui_obconf.h" line="1037"/>
         <source>Create a theme &amp;archive (.obt)...</source>
         <translation>&amp;Utwórz archiwum motywu (.obt)...</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="856"/>
+        <location filename="../../build/src/ui_obconf.h" line="1039"/>
         <source>&amp;Windows retain a border when undecorated</source>
         <translation>Okna zacho&amp;wują obramowanie, gdy nie mają dekoracji</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="857"/>
+        <location filename="../../build/src/ui_obconf.h" line="1040"/>
         <source>A&amp;nimate iconify and restore</source>
         <translation>A&amp;nimowane zwinięcie do ikony i odtworzenie</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="873"/>
+        <location filename="../../build/src/ui_obconf.h" line="1056"/>
         <source>&amp;Active window title: </source>
         <translation>Tytuł &amp;aktywnego okna: </translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="874"/>
+        <location filename="../../build/src/ui_obconf.h" line="1057"/>
         <source>&amp;Inactive window title: </source>
         <translation>Tytuł n&amp;ieaktywnego okna: </translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="875"/>
+        <location filename="../../build/src/ui_obconf.h" line="1058"/>
         <source>Menu &amp;header: </source>
         <translation>&amp;Nagłówek menu: </translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="876"/>
+        <location filename="../../build/src/ui_obconf.h" line="1059"/>
         <source>&amp;Menu Item: </source>
         <translation>&amp;Element menu: </translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="877"/>
+        <location filename="../../build/src/ui_obconf.h" line="1060"/>
         <source>Active &amp;On-screen display: </source>
         <translation>Aktywne &amp;okienko informacyjne na ekranie: </translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="878"/>
+        <location filename="../../build/src/ui_obconf.h" line="1061"/>
         <source>Inactive O&amp;n-screen display: </source>
         <translation>Nieaktywne okie&amp;nko informacyjne na ekranie: </translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="879"/>
+        <location filename="../../build/src/ui_obconf.h" line="1062"/>
         <source>Focus &amp;new windows when they appear</source>
         <translation>Aktywuj &amp;nowe okna, gdy się pojawią</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="880"/>
+        <location filename="../../build/src/ui_obconf.h" line="1063"/>
         <source>&amp;Place new windows under the mouse pointer</source>
         <translation>_Umieszczaj nowe okna pod wskaźnikiem myszy</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="881"/>
+        <location filename="../../build/src/ui_obconf.h" line="1064"/>
         <source>&amp;Center new windows when they are placed</source>
         <translation>Wyśrodkuj nowe okna, gdy są one umiesz&amp;czane</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="882"/>
+        <location filename="../../build/src/ui_obconf.h" line="1065"/>
         <source>Prefer to place new windows &amp;on:</source>
         <translation>Preferencja d&amp;o umieszczania nowych okien na:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="892"/>
+        <location filename="../../build/src/ui_obconf.h" line="1075"/>
         <source>Primary &amp;monitor:</source>
         <translation>&amp;Monitor główny:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="899"/>
+        <location filename="../../build/src/ui_obconf.h" line="1082"/>
         <source>&amp;Fixed monitor:</source>
         <translation>&amp;Stały monitor:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="901"/>
+        <location filename="../../build/src/ui_obconf.h" line="1084"/>
         <source>Update the window contents while &amp;resizing</source>
         <translation>Aktualizacja zawa&amp;rtości okna przy zmianie jego wielkości</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="902"/>
+        <location filename="../../build/src/ui_obconf.h" line="1085"/>
         <source>Drag &amp;threshold distance:</source>
         <translation>Opór odle&amp;głości progowej:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="903"/>
+        <location filename="../../build/src/ui_obconf.h" line="1086"/>
         <source>Amount of resistance against other &amp;windows:</source>
         <translation>&amp;Wielkość oporu przeciwko innym oknom:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="904"/>
+        <location filename="../../build/src/ui_obconf.h" line="1087"/>
         <source>Amount of resistance against screen &amp;edges:</source>
         <translation>Wielkość oporu przeciwko krawędziom &amp;ekranu:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="905"/>
+        <location filename="../../build/src/ui_obconf.h" line="1088"/>
         <source>&amp;Amount of time to wait before switching:</source>
         <translation>Ilość cz&amp;asu do oczekiwania przed przełączeniem:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="906"/>
+        <location filename="../../build/src/ui_obconf.h" line="1089"/>
         <source>&amp;Switch desktops when moving a window past the screen edge</source>
         <translation>Przełącz pulpity podcza&amp;s przenoszenia okna poza krawędź ekranu</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="914"/>
+        <location filename="../../build/src/ui_obconf.h" line="1097"/>
         <source>Fixed &amp;y position:</source>
         <translation>Stała pozycja &amp;y:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="921"/>
+        <location filename="../../build/src/ui_obconf.h" line="1104"/>
         <source>Information dialog&apos;s &amp;position:</source>
         <translation>&amp;Pozycja okna dialogowego informacji:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="922"/>
+        <location filename="../../build/src/ui_obconf.h" line="1105"/>
         <source>Fixed &amp;x position:</source>
         <translation>Stała pozycja &amp;x:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="923"/>
+        <location filename="../../build/src/ui_obconf.h" line="1106"/>
         <source>Show &amp;information dialog:</source>
         <translation>Pokaż okno &amp;informacyjne:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="938"/>
+        <location filename="../../build/src/ui_obconf.h" line="1121"/>
         <source>&amp;Delay before focusing and raising windows:</source>
         <translation>&amp;Opóźnienie przed aktywacją i wznoszeniem okien:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="939"/>
+        <location filename="../../build/src/ui_obconf.h" line="1122"/>
         <source>Move focus under the mouse when &amp;switching desktops</source>
         <translation>Przenieś zaznaczenie pod wskaźnik my&amp;szy podczas przełączania pulpitów</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="940"/>
+        <location filename="../../build/src/ui_obconf.h" line="1123"/>
         <source>Move focus &amp;under the mouse when the mouse is not moving</source>
         <translation>Przenieś zaznaczenie pod wskaźnik myszy, gdy mysz jest nier&amp;uchoma</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="941"/>
+        <location filename="../../build/src/ui_obconf.h" line="1124"/>
         <source>&amp;Raise windows when the mouse pointer moves over them</source>
         <translation>&amp;Aktywuj okna, gdy wskaźnik myszy znajduje się nad nimi</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="943"/>
+        <location filename="../../build/src/ui_obconf.h" line="1126"/>
         <source>Double click on the &amp;titlebar:</source>
         <translation>Podwójne kliknięcie na pasku &amp;tytułu:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="949"/>
+        <location filename="../../build/src/ui_obconf.h" line="1132"/>
         <source>Double click ti&amp;me:</source>
         <translation>Czas &amp;dwukrotnego kliknięcia:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="950"/>
+        <location filename="../../build/src/ui_obconf.h" line="1133"/>
         <source>&amp;Show a notification when switching desktops</source>
         <translation>Pokaż powiadomienie podcza&amp;s przełączania pulpitów</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="951"/>
+        <location filename="../../build/src/ui_obconf.h" line="1134"/>
         <source>&amp;Amount of time to show the notification for:</source>
         <translation>Ilość cz&amp;asu do wyświetlania powiadomienia dla:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="952"/>
+        <location filename="../../build/src/ui_obconf.h" line="1135"/>
         <source>&amp;Number of desktops: </source>
         <translation>&amp;Liczba pulpitów: </translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="953"/>
+        <location filename="../../build/src/ui_obconf.h" line="1136"/>
         <source>&amp;Desktop names:</source>
         <translation>Nazwy &amp;pulpitów:</translation>
     </message>
@@ -462,8 +592,9 @@ D: Wszechobecne (Na wszystkich pulpitach)</translation>
         <translation>Działania własne</translation>
     </message>
     <message>
-        <location filename="../desktops.cpp" line="152"/>
-        <location filename="../desktops.cpp" line="162"/>
+        <location filename="../desktops.cpp" line="65"/>
+        <location filename="../desktops.cpp" line="87"/>
+        <location filename="../desktops.cpp" line="99"/>
         <source>(Unnamed desktop)</source>
         <translation>(Nienazwany pulpit)</translation>
     </message>
@@ -476,6 +607,20 @@ D: Wszechobecne (Na wszystkich pulpitach)</translation>
         <location filename="../maindialog.cpp" line="77"/>
         <source>A preferences manager for Openbox
 
+Copyright (c) 2014-2015
+
+Authors:
+* Hong Jen Yee (PCMan) &lt;pcman.tw@gmail.com&gt;
+
+The program is based on ObConf developed by the following developers.
+* Dana Jansens &lt;danakj@orodu.net&gt;
+* Tim Riley &lt;tr@slackzone.org&gt;
+* Javeed Shaikh &lt;syscrash2k@gmail.com&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A preferences manager for Openbox
+
 Copyright (c) 2003-2013
 
 Authors:
@@ -483,7 +628,7 @@ Authors:
 * Dana Jansens &lt;danakj@orodu.net&gt;
 * Tim Riley &lt;tr@slackzone.org&gt;
 * Javeed Shaikh &lt;syscrash2k@gmail.com&gt;</source>
-        <translation>Zarządca preferencji dla Openbox
+        <translation type="vanished">Zarządca preferencji dla Openbox
 
 Prawa autorskie (c) 2003-2013
 

src/translations/obconf-qt_pt.ts

@@ -17,237 +17,237 @@
 <context>
     <name>MainDialog</name>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="844"/>
+        <location filename="../../build/src/ui_obconf.h" line="1027"/>
         <source>Mouse</source>
         <translation>Rato</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="829"/>
+        <location filename="../../build/src/ui_obconf.h" line="1012"/>
         <source>Window Manager Preferences</source>
         <translation>Preferências de gestor de janelas</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="834"/>
+        <location filename="../../build/src/ui_obconf.h" line="1017"/>
         <source>Theme</source>
         <translation>Tema</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="836"/>
+        <location filename="../../build/src/ui_obconf.h" line="1019"/>
         <source>Appearance</source>
         <translation>Aparência</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="838"/>
+        <location filename="../../build/src/ui_obconf.h" line="1021"/>
         <source>Font</source>
         <translation>Tipo de letra</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="840"/>
-        <location filename="../../build/src/ui_obconf.h" line="855"/>
+        <location filename="../../build/src/ui_obconf.h" line="1023"/>
+        <location filename="../../build/src/ui_obconf.h" line="1038"/>
         <source>Windows</source>
         <translation>Janelas</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="842"/>
+        <location filename="../../build/src/ui_obconf.h" line="1025"/>
         <source>Move &amp; Resize</source>
         <translation>Mover e redimensionar</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="846"/>
+        <location filename="../../build/src/ui_obconf.h" line="1029"/>
         <source>Desktops</source>
         <translation>Áreas de trabalho</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="848"/>
+        <location filename="../../build/src/ui_obconf.h" line="1031"/>
         <source>Margins</source>
         <translation>Margens</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="850"/>
+        <location filename="../../build/src/ui_obconf.h" line="1033"/>
         <source>Dock</source>
         <translation>Doca</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="858"/>
+        <location filename="../../build/src/ui_obconf.h" line="1041"/>
         <source>Window Titles</source>
         <translation>Título das janelas</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="859"/>
+        <location filename="../../build/src/ui_obconf.h" line="1042"/>
         <source>Button order:</source>
         <translation>Ordem dos botões:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="900"/>
+        <location filename="../../build/src/ui_obconf.h" line="1083"/>
         <source>Moving and Resizing Windows</source>
         <translation>Movimentação e redimensionamento de janelas</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="907"/>
+        <location filename="../../build/src/ui_obconf.h" line="1090"/>
         <source>Information Dialog</source>
         <translation>Diálogos</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="936"/>
+        <location filename="../../build/src/ui_obconf.h" line="1119"/>
         <source>Focusing Windows</source>
         <translation>Foco de janelas</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="937"/>
+        <location filename="../../build/src/ui_obconf.h" line="1120"/>
         <source>Focus windows when the mouse pointer moves over them</source>
         <translation>Focar janelas ao passar com o ponteiro do rato</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="942"/>
+        <location filename="../../build/src/ui_obconf.h" line="1125"/>
         <source>Titlebar</source>
         <translation>Barra de título</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="954"/>
+        <location filename="../../build/src/ui_obconf.h" line="1137"/>
         <source>Desktop Margins</source>
         <translation>Margens da área de trabalho</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="955"/>
+        <location filename="../../build/src/ui_obconf.h" line="1138"/>
         <source>Desktop margins are reserved areas on the edge of your screen.  New windows will not be placed within a margin, and maximized windows will not cover them.</source>
         <translation>As margens da área de trabalho são as áreas reservadas nos limites do ecrã. As janelas não serão colocadas nas margens e as janelas maximizadas também não as cobrirão.</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="956"/>
+        <location filename="../../build/src/ui_obconf.h" line="1139"/>
         <source>Left:</source>
         <translation>Esquerda:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="957"/>
-        <location filename="../../build/src/ui_obconf.h" line="959"/>
-        <location filename="../../build/src/ui_obconf.h" line="961"/>
-        <location filename="../../build/src/ui_obconf.h" line="963"/>
+        <location filename="../../build/src/ui_obconf.h" line="1140"/>
+        <location filename="../../build/src/ui_obconf.h" line="1142"/>
+        <location filename="../../build/src/ui_obconf.h" line="1144"/>
+        <location filename="../../build/src/ui_obconf.h" line="1146"/>
         <source>px</source>
         <translation>px</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="958"/>
+        <location filename="../../build/src/ui_obconf.h" line="1141"/>
         <source>Top:</source>
         <translation>Superior:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="960"/>
+        <location filename="../../build/src/ui_obconf.h" line="1143"/>
         <source>Right:</source>
         <translation>Direita:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="962"/>
+        <location filename="../../build/src/ui_obconf.h" line="1145"/>
         <source>Bottom:</source>
         <translation>Inferior:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="885"/>
+        <location filename="../../build/src/ui_obconf.h" line="1068"/>
         <source>All monitors</source>
         <translation>Todos os monitores</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="886"/>
+        <location filename="../../build/src/ui_obconf.h" line="1069"/>
         <source>The active monitor</source>
         <translation>Monitor ativo</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="887"/>
+        <location filename="../../build/src/ui_obconf.h" line="1070"/>
         <source>The monitor with the mouse</source>
         <translation>Monitor com o ponteiro do rato</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="890"/>
+        <location filename="../../build/src/ui_obconf.h" line="1073"/>
         <source>Primary Monitor</source>
         <translation>Monitor principal</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="891"/>
+        <location filename="../../build/src/ui_obconf.h" line="1074"/>
         <source>The primary monitor is where Openbox will place dialogs, such as the one used for cycling windows.</source>
         <translation>O monitor principal é aquele em que o Openbox apresenta os diálogos, tais como o diálogo para percorrer janelas.</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="895"/>
+        <location filename="../../build/src/ui_obconf.h" line="1078"/>
         <source>Fixed Monitor</source>
         <translation>Monitor fixo</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="896"/>
+        <location filename="../../build/src/ui_obconf.h" line="1079"/>
         <source>Active Monitor</source>
         <translation>Monitor ativo</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="897"/>
+        <location filename="../../build/src/ui_obconf.h" line="1080"/>
         <source>Monitor With Mouse Pointer</source>
         <translation>Monitor com o ponteiro do rato</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="910"/>
-        <location filename="../../build/src/ui_obconf.h" line="917"/>
+        <location filename="../../build/src/ui_obconf.h" line="1093"/>
+        <location filename="../../build/src/ui_obconf.h" line="1100"/>
         <source>Centered</source>
         <translation>Centro</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="911"/>
+        <location filename="../../build/src/ui_obconf.h" line="1094"/>
         <source>From left edge</source>
         <translation>Da margem esquerda</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="912"/>
+        <location filename="../../build/src/ui_obconf.h" line="1095"/>
         <source>From right edge</source>
         <translation>Da margem direita</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="918"/>
+        <location filename="../../build/src/ui_obconf.h" line="1101"/>
         <source>From top edge</source>
         <translation>Da margem superior</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="919"/>
+        <location filename="../../build/src/ui_obconf.h" line="1102"/>
         <source>From bottom edge</source>
         <translation>Da margem inferior</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="926"/>
+        <location filename="../../build/src/ui_obconf.h" line="1109"/>
         <source>When resizing terminal windows</source>
         <translation>Ao redimensionar as janelas de terminal</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="927"/>
+        <location filename="../../build/src/ui_obconf.h" line="1110"/>
         <source>Always</source>
         <translation>Sempre</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="928"/>
+        <location filename="../../build/src/ui_obconf.h" line="1111"/>
         <source>Never</source>
         <translation>Nunca</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="932"/>
+        <location filename="../../build/src/ui_obconf.h" line="1115"/>
         <source>Centered on the window</source>
         <translation>Centrar na janela</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="933"/>
+        <location filename="../../build/src/ui_obconf.h" line="1116"/>
         <source>Above the window</source>
         <translation>Por cima da janela</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="934"/>
+        <location filename="../../build/src/ui_obconf.h" line="1117"/>
         <source>Fixed position on screen</source>
         <translation>Posição fixa no ecrã</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="946"/>
+        <location filename="../../build/src/ui_obconf.h" line="1129"/>
         <source>Maximizes the window</source>
         <translation>Maximiza a janela</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="947"/>
+        <location filename="../../build/src/ui_obconf.h" line="1130"/>
         <source>Shades the window</source>
         <translation>Enrola a janela</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="860"/>
+        <location filename="../../build/src/ui_obconf.h" line="1043"/>
         <source>N: Window icon
 L: Window label (Title)
 I: Iconify (Minimize)
@@ -264,192 +264,322 @@ S: Enrolar
 D: Omnipresente (todas as áreas de trabalho)</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="888"/>
+        <location filename="../../build/src/ui_obconf.h" line="1071"/>
         <source>Primary monitor</source>
         <translation>Monitor principal</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="964"/>
+        <location filename="../../build/src/ui_obconf.h" line="1147"/>
+        <source>The dock is a special container for &quot;dockapps&quot;, or dock applications.  It is not visible on screen until a dockapp is run.  Dockapps can be used to show things like a clock, or to provide you with a system tray.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1148"/>
+        <source>Position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1149"/>
+        <source>&amp;Position:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1152"/>
+        <source>Top Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1153"/>
+        <source>Top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1154"/>
+        <source>Top Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1155"/>
+        <source>Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1156"/>
+        <source>Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1157"/>
+        <source>Bottom Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1158"/>
+        <source>Bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1159"/>
+        <source>Bottom Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1160"/>
+        <source>Floating</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1162"/>
+        <source>&amp;Floating position:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1163"/>
+        <source>x</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1164"/>
+        <source>Allow &amp;windows to be placed within the dock&apos;s area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1165"/>
+        <source>&amp;Orientation: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1168"/>
+        <source>Vertical</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1169"/>
+        <source>Horizontal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1171"/>
+        <source>Stacking</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1172"/>
+        <source>Keep dock &amp;above other windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1173"/>
+        <source>A&amp;llow dock to be both above and below windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1174"/>
+        <source>Keep dock &amp;below other windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1175"/>
+        <source>Hiding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1176"/>
+        <source>&amp;Delay before hiding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1177"/>
+        <source>Delay before &amp;showing:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1178"/>
+        <source>&amp;Hide off screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1179"/>
         <source>About</source>
         <translation>Sobre</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="853"/>
+        <location filename="../../build/src/ui_obconf.h" line="1036"/>
         <source>&amp;Install a new theme...</source>
         <translation>&amp;Instalar um tema...</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="854"/>
+        <location filename="../../build/src/ui_obconf.h" line="1037"/>
         <source>Create a theme &amp;archive (.obt)...</source>
         <translation> Criar um &amp;arquivo de tema (.obt)...</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="856"/>
+        <location filename="../../build/src/ui_obconf.h" line="1039"/>
         <source>&amp;Windows retain a border when undecorated</source>
         <translation>As &amp;janelas possuem contorno mesmo que não decoradas</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="857"/>
+        <location filename="../../build/src/ui_obconf.h" line="1040"/>
         <source>A&amp;nimate iconify and restore</source>
         <translation>A&amp;nimar minimização e restauro</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="873"/>
+        <location filename="../../build/src/ui_obconf.h" line="1056"/>
         <source>&amp;Active window title: </source>
         <translation>Título da janela &amp;ativa: </translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="874"/>
+        <location filename="../../build/src/ui_obconf.h" line="1057"/>
         <source>&amp;Inactive window title: </source>
         <translation>Título da janela &amp;inativa: </translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="875"/>
+        <location filename="../../build/src/ui_obconf.h" line="1058"/>
         <source>Menu &amp;header: </source>
         <translation>Cabeçal&amp;lho de menu: </translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="876"/>
+        <location filename="../../build/src/ui_obconf.h" line="1059"/>
         <source>&amp;Menu Item: </source>
         <translation>Item de &amp;menu: </translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="877"/>
+        <location filename="../../build/src/ui_obconf.h" line="1060"/>
         <source>Active &amp;On-screen display: </source>
         <translation>Visualização no ecrã (&amp;OSD) ativo: </translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="878"/>
+        <location filename="../../build/src/ui_obconf.h" line="1061"/>
         <source>Inactive O&amp;n-screen display: </source>
         <translation>Visualização no ecrã (O&amp;SD) inativo: </translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="879"/>
+        <location filename="../../build/src/ui_obconf.h" line="1062"/>
         <source>Focus &amp;new windows when they appear</source>
         <translation>Focar &amp;novas janelas assim que aparecerem</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="880"/>
+        <location filename="../../build/src/ui_obconf.h" line="1063"/>
         <source>&amp;Place new windows under the mouse pointer</source>
         <translation>&amp;Posicionar novas janelas por baixo do ponteiro do rato</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="881"/>
+        <location filename="../../build/src/ui_obconf.h" line="1064"/>
         <source>&amp;Center new windows when they are placed</source>
         <translation>&amp;Centrar novas janelas assim que forem posicionadas</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="882"/>
+        <location filename="../../build/src/ui_obconf.h" line="1065"/>
         <source>Prefer to place new windows &amp;on:</source>
         <translation>C&amp;olocar novas janelas em:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="892"/>
+        <location filename="../../build/src/ui_obconf.h" line="1075"/>
         <source>Primary &amp;monitor:</source>
         <translation>&amp;Monitor principal:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="899"/>
+        <location filename="../../build/src/ui_obconf.h" line="1082"/>
         <source>&amp;Fixed monitor:</source>
         <translation>Monitor &amp;fixo:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="901"/>
+        <location filename="../../build/src/ui_obconf.h" line="1084"/>
         <source>Update the window contents while &amp;resizing</source>
         <translation>Atualizar conteúdo da janela ao &amp;redimensionar</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="902"/>
+        <location filename="../../build/src/ui_obconf.h" line="1085"/>
         <source>Drag &amp;threshold distance:</source>
         <translation>Dis&amp;tância de arrasto:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="903"/>
+        <location filename="../../build/src/ui_obconf.h" line="1086"/>
         <source>Amount of resistance against other &amp;windows:</source>
         <translation>Resistência em relação às outras &amp;janelas:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="904"/>
+        <location filename="../../build/src/ui_obconf.h" line="1087"/>
         <source>Amount of resistance against screen &amp;edges:</source>
         <translation>Resistência em relação aos limit&amp;es do ecrã:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="905"/>
+        <location filename="../../build/src/ui_obconf.h" line="1088"/>
         <source>&amp;Amount of time to wait before switching:</source>
         <translation>Tempo de esper&amp;a antes de trocar:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="906"/>
+        <location filename="../../build/src/ui_obconf.h" line="1089"/>
         <source>&amp;Switch desktops when moving a window past the screen edge</source>
         <translation>Trocar de área de trabalho ao mover a janela para além do&amp;s limites do ecrã</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="914"/>
+        <location filename="../../build/src/ui_obconf.h" line="1097"/>
         <source>Fixed &amp;y position:</source>
         <translation>Posição &amp;Y:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="921"/>
+        <location filename="../../build/src/ui_obconf.h" line="1104"/>
         <source>Information dialog&apos;s &amp;position:</source>
         <translation>&amp;Posição do diálogo:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="922"/>
+        <location filename="../../build/src/ui_obconf.h" line="1105"/>
         <source>Fixed &amp;x position:</source>
         <translation>Posição &amp;X:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="923"/>
+        <location filename="../../build/src/ui_obconf.h" line="1106"/>
         <source>Show &amp;information dialog:</source>
         <translation>Mostrar d&amp;iálogo de informações:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="938"/>
+        <location filename="../../build/src/ui_obconf.h" line="1121"/>
         <source>&amp;Delay before focusing and raising windows:</source>
         <translation>Atraso antes &amp;de focar e mostrar janelas:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="939"/>
+        <location filename="../../build/src/ui_obconf.h" line="1122"/>
         <source>Move focus under the mouse when &amp;switching desktops</source>
         <translation>Mover foco para bai&amp;xo do rato ao trocar de área de trabalho</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="940"/>
+        <location filename="../../build/src/ui_obconf.h" line="1123"/>
         <source>Move focus &amp;under the mouse when the mouse is not moving</source>
         <translation>Mover foco para baixo do rato se este não esti&amp;ver em movimento</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="941"/>
+        <location filename="../../build/src/ui_obconf.h" line="1124"/>
         <source>&amp;Raise windows when the mouse pointer moves over them</source>
         <translation>Most&amp;rar janelas ao passar o rato sobre as mesmas</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="943"/>
+        <location filename="../../build/src/ui_obconf.h" line="1126"/>
         <source>Double click on the &amp;titlebar:</source>
         <translation>Duplo clique na barra de &amp;título:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="949"/>
+        <location filename="../../build/src/ui_obconf.h" line="1132"/>
         <source>Double click ti&amp;me:</source>
         <translation>Te&amp;mpo do duplo clique:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="950"/>
+        <location filename="../../build/src/ui_obconf.h" line="1133"/>
         <source>&amp;Show a notification when switching desktops</source>
         <translation>Mo&amp;strar notificação ao trocar a área de trabalho</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="951"/>
+        <location filename="../../build/src/ui_obconf.h" line="1134"/>
         <source>&amp;Amount of time to show the notification for:</source>
         <translation>Mostr&amp;ar notificação durante:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="952"/>
+        <location filename="../../build/src/ui_obconf.h" line="1135"/>
         <source>&amp;Number of desktops: </source>
         <translation>&amp;Número de áreas de trabalho: </translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="953"/>
+        <location filename="../../build/src/ui_obconf.h" line="1136"/>
         <source>&amp;Desktop names:</source>
         <translation>Nome das áreas &amp;de trabalho:</translation>
     </message>
@@ -462,8 +592,9 @@ D: Omnipresente (todas as áreas de trabalho)</translation>
         <translation>Ações personalizadas</translation>
     </message>
     <message>
-        <location filename="../desktops.cpp" line="152"/>
-        <location filename="../desktops.cpp" line="162"/>
+        <location filename="../desktops.cpp" line="65"/>
+        <location filename="../desktops.cpp" line="87"/>
+        <location filename="../desktops.cpp" line="99"/>
         <source>(Unnamed desktop)</source>
         <translation>(Área de trabalho sem nome)</translation>
     </message>
@@ -476,6 +607,20 @@ D: Omnipresente (todas as áreas de trabalho)</translation>
         <location filename="../maindialog.cpp" line="77"/>
         <source>A preferences manager for Openbox
 
+Copyright (c) 2014-2015
+
+Authors:
+* Hong Jen Yee (PCMan) &lt;pcman.tw@gmail.com&gt;
+
+The program is based on ObConf developed by the following developers.
+* Dana Jansens &lt;danakj@orodu.net&gt;
+* Tim Riley &lt;tr@slackzone.org&gt;
+* Javeed Shaikh &lt;syscrash2k@gmail.com&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A preferences manager for Openbox
+
 Copyright (c) 2003-2013
 
 Authors:
@@ -483,7 +628,7 @@ Authors:
 * Dana Jansens &lt;danakj@orodu.net&gt;
 * Tim Riley &lt;tr@slackzone.org&gt;
 * Javeed Shaikh &lt;syscrash2k@gmail.com&gt;</source>
-        <translation>O gestor de definições do Openbox
+        <translation type="vanished">O gestor de definições do Openbox
 
 Copyright (c) 2003-2013
 

src/translations/obconf-qt_pt_BR.ts

@@ -17,237 +17,237 @@
 <context>
     <name>MainDialog</name>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="844"/>
+        <location filename="../../build/src/ui_obconf.h" line="1027"/>
         <source>Mouse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="829"/>
+        <location filename="../../build/src/ui_obconf.h" line="1012"/>
         <source>Window Manager Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="834"/>
+        <location filename="../../build/src/ui_obconf.h" line="1017"/>
         <source>Theme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="836"/>
+        <location filename="../../build/src/ui_obconf.h" line="1019"/>
         <source>Appearance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="838"/>
+        <location filename="../../build/src/ui_obconf.h" line="1021"/>
         <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"/>
+        <location filename="../../build/src/ui_obconf.h" line="1023"/>
+        <location filename="../../build/src/ui_obconf.h" line="1038"/>
         <source>Windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="842"/>
+        <location filename="../../build/src/ui_obconf.h" line="1025"/>
         <source>Move &amp; Resize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="846"/>
+        <location filename="../../build/src/ui_obconf.h" line="1029"/>
         <source>Desktops</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="848"/>
+        <location filename="../../build/src/ui_obconf.h" line="1031"/>
         <source>Margins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="850"/>
+        <location filename="../../build/src/ui_obconf.h" line="1033"/>
         <source>Dock</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="858"/>
+        <location filename="../../build/src/ui_obconf.h" line="1041"/>
         <source>Window Titles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="859"/>
+        <location filename="../../build/src/ui_obconf.h" line="1042"/>
         <source>Button order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="900"/>
+        <location filename="../../build/src/ui_obconf.h" line="1083"/>
         <source>Moving and Resizing Windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="907"/>
+        <location filename="../../build/src/ui_obconf.h" line="1090"/>
         <source>Information Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="936"/>
+        <location filename="../../build/src/ui_obconf.h" line="1119"/>
         <source>Focusing Windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="937"/>
+        <location filename="../../build/src/ui_obconf.h" line="1120"/>
         <source>Focus windows when the mouse pointer moves over them</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="942"/>
+        <location filename="../../build/src/ui_obconf.h" line="1125"/>
         <source>Titlebar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="954"/>
+        <location filename="../../build/src/ui_obconf.h" line="1137"/>
         <source>Desktop Margins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="955"/>
+        <location filename="../../build/src/ui_obconf.h" line="1138"/>
         <source>Desktop margins are reserved areas on the edge of your screen.  New windows will not be placed within a margin, and maximized windows will not cover them.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="956"/>
+        <location filename="../../build/src/ui_obconf.h" line="1139"/>
         <source>Left:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="957"/>
-        <location filename="../../build/src/ui_obconf.h" line="959"/>
-        <location filename="../../build/src/ui_obconf.h" line="961"/>
-        <location filename="../../build/src/ui_obconf.h" line="963"/>
+        <location filename="../../build/src/ui_obconf.h" line="1140"/>
+        <location filename="../../build/src/ui_obconf.h" line="1142"/>
+        <location filename="../../build/src/ui_obconf.h" line="1144"/>
+        <location filename="../../build/src/ui_obconf.h" line="1146"/>
         <source>px</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="958"/>
+        <location filename="../../build/src/ui_obconf.h" line="1141"/>
         <source>Top:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="960"/>
+        <location filename="../../build/src/ui_obconf.h" line="1143"/>
         <source>Right:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="962"/>
+        <location filename="../../build/src/ui_obconf.h" line="1145"/>
         <source>Bottom:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="885"/>
+        <location filename="../../build/src/ui_obconf.h" line="1068"/>
         <source>All monitors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="886"/>
+        <location filename="../../build/src/ui_obconf.h" line="1069"/>
         <source>The active monitor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="887"/>
+        <location filename="../../build/src/ui_obconf.h" line="1070"/>
         <source>The monitor with the mouse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="890"/>
+        <location filename="../../build/src/ui_obconf.h" line="1073"/>
         <source>Primary Monitor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="891"/>
+        <location filename="../../build/src/ui_obconf.h" line="1074"/>
         <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="895"/>
+        <location filename="../../build/src/ui_obconf.h" line="1078"/>
         <source>Fixed Monitor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="896"/>
+        <location filename="../../build/src/ui_obconf.h" line="1079"/>
         <source>Active Monitor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="897"/>
+        <location filename="../../build/src/ui_obconf.h" line="1080"/>
         <source>Monitor With Mouse Pointer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="910"/>
-        <location filename="../../build/src/ui_obconf.h" line="917"/>
+        <location filename="../../build/src/ui_obconf.h" line="1093"/>
+        <location filename="../../build/src/ui_obconf.h" line="1100"/>
         <source>Centered</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="911"/>
+        <location filename="../../build/src/ui_obconf.h" line="1094"/>
         <source>From left edge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="912"/>
+        <location filename="../../build/src/ui_obconf.h" line="1095"/>
         <source>From right edge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="918"/>
+        <location filename="../../build/src/ui_obconf.h" line="1101"/>
         <source>From top edge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="919"/>
+        <location filename="../../build/src/ui_obconf.h" line="1102"/>
         <source>From bottom edge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="926"/>
+        <location filename="../../build/src/ui_obconf.h" line="1109"/>
         <source>When resizing terminal windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="927"/>
+        <location filename="../../build/src/ui_obconf.h" line="1110"/>
         <source>Always</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="928"/>
+        <location filename="../../build/src/ui_obconf.h" line="1111"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="932"/>
+        <location filename="../../build/src/ui_obconf.h" line="1115"/>
         <source>Centered on the window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="933"/>
+        <location filename="../../build/src/ui_obconf.h" line="1116"/>
         <source>Above the window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="934"/>
+        <location filename="../../build/src/ui_obconf.h" line="1117"/>
         <source>Fixed position on screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="946"/>
+        <location filename="../../build/src/ui_obconf.h" line="1129"/>
         <source>Maximizes the window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="947"/>
+        <location filename="../../build/src/ui_obconf.h" line="1130"/>
         <source>Shades the window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="860"/>
+        <location filename="../../build/src/ui_obconf.h" line="1043"/>
         <source>N: Window icon
 L: Window label (Title)
 I: Iconify (Minimize)
@@ -258,192 +258,322 @@ D: Omnipresent (On all desktops)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="888"/>
+        <location filename="../../build/src/ui_obconf.h" line="1071"/>
         <source>Primary monitor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="964"/>
+        <location filename="../../build/src/ui_obconf.h" line="1147"/>
+        <source>The dock is a special container for &quot;dockapps&quot;, or dock applications.  It is not visible on screen until a dockapp is run.  Dockapps can be used to show things like a clock, or to provide you with a system tray.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1148"/>
+        <source>Position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1149"/>
+        <source>&amp;Position:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1152"/>
+        <source>Top Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1153"/>
+        <source>Top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1154"/>
+        <source>Top Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1155"/>
+        <source>Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1156"/>
+        <source>Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1157"/>
+        <source>Bottom Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1158"/>
+        <source>Bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1159"/>
+        <source>Bottom Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1160"/>
+        <source>Floating</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1162"/>
+        <source>&amp;Floating position:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1163"/>
+        <source>x</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1164"/>
+        <source>Allow &amp;windows to be placed within the dock&apos;s area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1165"/>
+        <source>&amp;Orientation: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1168"/>
+        <source>Vertical</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1169"/>
+        <source>Horizontal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1171"/>
+        <source>Stacking</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1172"/>
+        <source>Keep dock &amp;above other windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1173"/>
+        <source>A&amp;llow dock to be both above and below windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1174"/>
+        <source>Keep dock &amp;below other windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1175"/>
+        <source>Hiding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1176"/>
+        <source>&amp;Delay before hiding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1177"/>
+        <source>Delay before &amp;showing:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1178"/>
+        <source>&amp;Hide off screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1179"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="853"/>
+        <location filename="../../build/src/ui_obconf.h" line="1036"/>
         <source>&amp;Install a new theme...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="854"/>
+        <location filename="../../build/src/ui_obconf.h" line="1037"/>
         <source>Create a theme &amp;archive (.obt)...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="856"/>
+        <location filename="../../build/src/ui_obconf.h" line="1039"/>
         <source>&amp;Windows retain a border when undecorated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="857"/>
+        <location filename="../../build/src/ui_obconf.h" line="1040"/>
         <source>A&amp;nimate iconify and restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="873"/>
+        <location filename="../../build/src/ui_obconf.h" line="1056"/>
         <source>&amp;Active window title: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="874"/>
+        <location filename="../../build/src/ui_obconf.h" line="1057"/>
         <source>&amp;Inactive window title: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="875"/>
+        <location filename="../../build/src/ui_obconf.h" line="1058"/>
         <source>Menu &amp;header: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="876"/>
+        <location filename="../../build/src/ui_obconf.h" line="1059"/>
         <source>&amp;Menu Item: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="877"/>
+        <location filename="../../build/src/ui_obconf.h" line="1060"/>
         <source>Active &amp;On-screen display: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="878"/>
+        <location filename="../../build/src/ui_obconf.h" line="1061"/>
         <source>Inactive O&amp;n-screen display: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="879"/>
+        <location filename="../../build/src/ui_obconf.h" line="1062"/>
         <source>Focus &amp;new windows when they appear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="880"/>
+        <location filename="../../build/src/ui_obconf.h" line="1063"/>
         <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"/>
+        <location filename="../../build/src/ui_obconf.h" line="1064"/>
         <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"/>
+        <location filename="../../build/src/ui_obconf.h" line="1065"/>
         <source>Prefer to place new windows &amp;on:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="892"/>
+        <location filename="../../build/src/ui_obconf.h" line="1075"/>
         <source>Primary &amp;monitor:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="899"/>
+        <location filename="../../build/src/ui_obconf.h" line="1082"/>
         <source>&amp;Fixed monitor:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="901"/>
+        <location filename="../../build/src/ui_obconf.h" line="1084"/>
         <source>Update the window contents while &amp;resizing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="902"/>
+        <location filename="../../build/src/ui_obconf.h" line="1085"/>
         <source>Drag &amp;threshold distance:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="903"/>
+        <location filename="../../build/src/ui_obconf.h" line="1086"/>
         <source>Amount of resistance against other &amp;windows:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="904"/>
+        <location filename="../../build/src/ui_obconf.h" line="1087"/>
         <source>Amount of resistance against screen &amp;edges:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="905"/>
+        <location filename="../../build/src/ui_obconf.h" line="1088"/>
         <source>&amp;Amount of time to wait before switching:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="906"/>
+        <location filename="../../build/src/ui_obconf.h" line="1089"/>
         <source>&amp;Switch desktops when moving a window past the screen edge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="914"/>
+        <location filename="../../build/src/ui_obconf.h" line="1097"/>
         <source>Fixed &amp;y position:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="921"/>
+        <location filename="../../build/src/ui_obconf.h" line="1104"/>
         <source>Information dialog&apos;s &amp;position:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="922"/>
+        <location filename="../../build/src/ui_obconf.h" line="1105"/>
         <source>Fixed &amp;x position:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="923"/>
+        <location filename="../../build/src/ui_obconf.h" line="1106"/>
         <source>Show &amp;information dialog:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="938"/>
+        <location filename="../../build/src/ui_obconf.h" line="1121"/>
         <source>&amp;Delay before focusing and raising windows:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="939"/>
+        <location filename="../../build/src/ui_obconf.h" line="1122"/>
         <source>Move focus under the mouse when &amp;switching desktops</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="940"/>
+        <location filename="../../build/src/ui_obconf.h" line="1123"/>
         <source>Move focus &amp;under the mouse when the mouse is not moving</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="941"/>
+        <location filename="../../build/src/ui_obconf.h" line="1124"/>
         <source>&amp;Raise windows when the mouse pointer moves over them</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="943"/>
+        <location filename="../../build/src/ui_obconf.h" line="1126"/>
         <source>Double click on the &amp;titlebar:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="949"/>
+        <location filename="../../build/src/ui_obconf.h" line="1132"/>
         <source>Double click ti&amp;me:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="950"/>
+        <location filename="../../build/src/ui_obconf.h" line="1133"/>
         <source>&amp;Show a notification when switching desktops</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="951"/>
+        <location filename="../../build/src/ui_obconf.h" line="1134"/>
         <source>&amp;Amount of time to show the notification for:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="952"/>
+        <location filename="../../build/src/ui_obconf.h" line="1135"/>
         <source>&amp;Number of desktops: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="953"/>
+        <location filename="../../build/src/ui_obconf.h" line="1136"/>
         <source>&amp;Desktop names:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -456,8 +586,9 @@ D: Omnipresent (On all desktops)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../desktops.cpp" line="152"/>
-        <location filename="../desktops.cpp" line="162"/>
+        <location filename="../desktops.cpp" line="65"/>
+        <location filename="../desktops.cpp" line="87"/>
+        <location filename="../desktops.cpp" line="99"/>
         <source>(Unnamed desktop)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -470,10 +601,12 @@ D: Omnipresent (On all desktops)</source>
         <location filename="../maindialog.cpp" line="77"/>
         <source>A preferences manager for Openbox
 
-Copyright (c) 2003-2013
+Copyright (c) 2014-2015
 
 Authors:
 * Hong Jen Yee (PCMan) &lt;pcman.tw@gmail.com&gt;
+
+The program is based on ObConf developed by the following developers.
 * Dana Jansens &lt;danakj@orodu.net&gt;
 * Tim Riley &lt;tr@slackzone.org&gt;
 * Javeed Shaikh &lt;syscrash2k@gmail.com&gt;</source>

src/translations/obconf-qt_ru.ts

@@ -17,88 +17,88 @@
 <context>
     <name>MainDialog</name>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="829"/>
+        <location filename="../../build/src/ui_obconf.h" line="1012"/>
         <source>Window Manager Preferences</source>
         <translation>Настройки менеджера окон</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="834"/>
+        <location filename="../../build/src/ui_obconf.h" line="1017"/>
         <source>Theme</source>
         <translation>Тема</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="836"/>
+        <location filename="../../build/src/ui_obconf.h" line="1019"/>
         <source>Appearance</source>
         <translation>Внешний вид</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="838"/>
+        <location filename="../../build/src/ui_obconf.h" line="1021"/>
         <source>Font</source>
         <translation>Шрифт</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="840"/>
-        <location filename="../../build/src/ui_obconf.h" line="855"/>
+        <location filename="../../build/src/ui_obconf.h" line="1023"/>
+        <location filename="../../build/src/ui_obconf.h" line="1038"/>
         <source>Windows</source>
         <translation>Окна</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="842"/>
+        <location filename="../../build/src/ui_obconf.h" line="1025"/>
         <source>Move &amp; Resize</source>
         <translation>Перемещение и изменение размера</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="844"/>
+        <location filename="../../build/src/ui_obconf.h" line="1027"/>
         <source>Mouse</source>
         <translation>Мышь</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="846"/>
+        <location filename="../../build/src/ui_obconf.h" line="1029"/>
         <source>Desktops</source>
         <translation>Рабочие столы</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="848"/>
+        <location filename="../../build/src/ui_obconf.h" line="1031"/>
         <source>Margins</source>
         <translation>Границы</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="850"/>
+        <location filename="../../build/src/ui_obconf.h" line="1033"/>
         <source>Dock</source>
         <translation>Док</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="853"/>
+        <location filename="../../build/src/ui_obconf.h" line="1036"/>
         <source>&amp;Install a new theme...</source>
         <translation>&amp;Установить новую тему...</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="854"/>
+        <location filename="../../build/src/ui_obconf.h" line="1037"/>
         <source>Create a theme &amp;archive (.obt)...</source>
         <translation>Создать &amp;архив с темой (.obt)...</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="856"/>
+        <location filename="../../build/src/ui_obconf.h" line="1039"/>
         <source>&amp;Windows retain a border when undecorated</source>
         <translation>&amp;Окна без декораций сохраняют края</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="857"/>
+        <location filename="../../build/src/ui_obconf.h" line="1040"/>
         <source>A&amp;nimate iconify and restore</source>
         <translation>А&amp;нимировать сворачивание и восстановление окна</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="858"/>
+        <location filename="../../build/src/ui_obconf.h" line="1041"/>
         <source>Window Titles</source>
         <translation>Заголовки окна</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="859"/>
+        <location filename="../../build/src/ui_obconf.h" line="1042"/>
         <source>Button order:</source>
         <translation>Порядок кнопок:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="860"/>
+        <location filename="../../build/src/ui_obconf.h" line="1043"/>
         <source>N: Window icon
 L: Window label (Title)
 I: Iconify (Minimize)
@@ -115,341 +115,471 @@ S: Свернуть в заголовок окна
 D: На все рабочие столы</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="873"/>
+        <location filename="../../build/src/ui_obconf.h" line="1056"/>
         <source>&amp;Active window title: </source>
         <translation>Название &amp;активного окна: </translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="874"/>
+        <location filename="../../build/src/ui_obconf.h" line="1057"/>
         <source>&amp;Inactive window title: </source>
         <translation>Название &amp;неактивного окна: </translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="875"/>
+        <location filename="../../build/src/ui_obconf.h" line="1058"/>
         <source>Menu &amp;header: </source>
         <translation>&amp;Заголовок меню: </translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="876"/>
+        <location filename="../../build/src/ui_obconf.h" line="1059"/>
         <source>&amp;Menu Item: </source>
         <translation>Пункт &amp;меню: </translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="877"/>
+        <location filename="../../build/src/ui_obconf.h" line="1060"/>
         <source>Active &amp;On-screen display: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="878"/>
+        <location filename="../../build/src/ui_obconf.h" line="1061"/>
         <source>Inactive O&amp;n-screen display: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="879"/>
+        <location filename="../../build/src/ui_obconf.h" line="1062"/>
         <source>Focus &amp;new windows when they appear</source>
         <translation>Передавать фокус &amp;новым окнам при их возникновении</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="880"/>
+        <location filename="../../build/src/ui_obconf.h" line="1063"/>
         <source>&amp;Place new windows under the mouse pointer</source>
         <translation>&amp;Помещать новые окна под курсором мыши</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="881"/>
+        <location filename="../../build/src/ui_obconf.h" line="1064"/>
         <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"/>
+        <location filename="../../build/src/ui_obconf.h" line="1065"/>
         <source>Prefer to place new windows &amp;on:</source>
         <translation>Предпочитать размещать новое окно &amp;на:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="885"/>
+        <location filename="../../build/src/ui_obconf.h" line="1068"/>
         <source>All monitors</source>
         <translation>Всех мониторах</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="886"/>
+        <location filename="../../build/src/ui_obconf.h" line="1069"/>
         <source>The active monitor</source>
         <translation>Активном мониторе</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="887"/>
+        <location filename="../../build/src/ui_obconf.h" line="1070"/>
         <source>The monitor with the mouse</source>
         <translation>Мониторе с мышью</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="888"/>
+        <location filename="../../build/src/ui_obconf.h" line="1071"/>
         <source>Primary monitor</source>
         <translation>Основном мониторе</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="890"/>
+        <location filename="../../build/src/ui_obconf.h" line="1073"/>
         <source>Primary Monitor</source>
         <translation>Основной монитор</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="891"/>
+        <location filename="../../build/src/ui_obconf.h" line="1074"/>
         <source>The primary monitor is where Openbox will place dialogs, such as the one used for cycling windows.</source>
         <translation>Основной монитор - это область, где Openbox будет размещать диалоги, такие как переключение окон.</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="892"/>
+        <location filename="../../build/src/ui_obconf.h" line="1075"/>
         <source>Primary &amp;monitor:</source>
         <translation>Основной &amp;монитор:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="895"/>
+        <location filename="../../build/src/ui_obconf.h" line="1078"/>
         <source>Fixed Monitor</source>
         <translation>Фиксированный монитор</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="896"/>
+        <location filename="../../build/src/ui_obconf.h" line="1079"/>
         <source>Active Monitor</source>
         <translation>Активный монитор</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="897"/>
+        <location filename="../../build/src/ui_obconf.h" line="1080"/>
         <source>Monitor With Mouse Pointer</source>
         <translation>Монитор с курсором мыши</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="899"/>
+        <location filename="../../build/src/ui_obconf.h" line="1082"/>
         <source>&amp;Fixed monitor:</source>
         <translation>&amp;Фиксированный монитор:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="900"/>
+        <location filename="../../build/src/ui_obconf.h" line="1083"/>
         <source>Moving and Resizing Windows</source>
         <translation>Перемещение и изменение размеров окон</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="901"/>
+        <location filename="../../build/src/ui_obconf.h" line="1084"/>
         <source>Update the window contents while &amp;resizing</source>
         <translation>Обновлять содержимое окна во &amp;время изменения размера</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="902"/>
+        <location filename="../../build/src/ui_obconf.h" line="1085"/>
         <source>Drag &amp;threshold distance:</source>
         <translation>&amp;Порог расстояния перетаскивания:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="903"/>
+        <location filename="../../build/src/ui_obconf.h" line="1086"/>
         <source>Amount of resistance against other &amp;windows:</source>
         <translation>Количество сопротивления к другим &amp;окнам:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="904"/>
+        <location filename="../../build/src/ui_obconf.h" line="1087"/>
         <source>Amount of resistance against screen &amp;edges:</source>
         <translation>Количество сопротивления к &amp;краям экрана:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="905"/>
+        <location filename="../../build/src/ui_obconf.h" line="1088"/>
         <source>&amp;Amount of time to wait before switching:</source>
         <translation>&amp;Время ожидания перед переключением:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="906"/>
+        <location filename="../../build/src/ui_obconf.h" line="1089"/>
         <source>&amp;Switch desktops when moving a window past the screen edge</source>
         <translation>&amp;Переключать рабочие столы при перемещенииокна за границы экрана</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="907"/>
+        <location filename="../../build/src/ui_obconf.h" line="1090"/>
         <source>Information Dialog</source>
         <translation>Информагионный диалог</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="910"/>
-        <location filename="../../build/src/ui_obconf.h" line="917"/>
+        <location filename="../../build/src/ui_obconf.h" line="1093"/>
+        <location filename="../../build/src/ui_obconf.h" line="1100"/>
         <source>Centered</source>
         <translation>По центру</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="911"/>
+        <location filename="../../build/src/ui_obconf.h" line="1094"/>
         <source>From left edge</source>
         <translation>От левого края</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="912"/>
+        <location filename="../../build/src/ui_obconf.h" line="1095"/>
         <source>From right edge</source>
         <translation>От правого края</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="914"/>
+        <location filename="../../build/src/ui_obconf.h" line="1097"/>
         <source>Fixed &amp;y position:</source>
         <translation>Фиксированное по &amp;y:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="918"/>
+        <location filename="../../build/src/ui_obconf.h" line="1101"/>
         <source>From top edge</source>
         <translation>Отверхеней границы</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="919"/>
+        <location filename="../../build/src/ui_obconf.h" line="1102"/>
         <source>From bottom edge</source>
         <translation>От нижней границы</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="921"/>
+        <location filename="../../build/src/ui_obconf.h" line="1104"/>
         <source>Information dialog&apos;s &amp;position:</source>
         <translation>&amp;Расположение информационного диалога:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="922"/>
+        <location filename="../../build/src/ui_obconf.h" line="1105"/>
         <source>Fixed &amp;x position:</source>
         <translation>Фиксированное по &amp;x:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="923"/>
+        <location filename="../../build/src/ui_obconf.h" line="1106"/>
         <source>Show &amp;information dialog:</source>
         <translation>Показывать &amp;информационный диалог:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="926"/>
+        <location filename="../../build/src/ui_obconf.h" line="1109"/>
         <source>When resizing terminal windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="927"/>
+        <location filename="../../build/src/ui_obconf.h" line="1110"/>
         <source>Always</source>
         <translation>Всегда</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="928"/>
+        <location filename="../../build/src/ui_obconf.h" line="1111"/>
         <source>Never</source>
         <translation>Никогда</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="932"/>
+        <location filename="../../build/src/ui_obconf.h" line="1115"/>
         <source>Centered on the window</source>
         <translation>По центру окна</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="933"/>
+        <location filename="../../build/src/ui_obconf.h" line="1116"/>
         <source>Above the window</source>
         <translation>Сверху окна</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="934"/>
+        <location filename="../../build/src/ui_obconf.h" line="1117"/>
         <source>Fixed position on screen</source>
         <translation>Фиксированное место на экране</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="936"/>
+        <location filename="../../build/src/ui_obconf.h" line="1119"/>
         <source>Focusing Windows</source>
         <translation>Передача фокуса окнам</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="937"/>
+        <location filename="../../build/src/ui_obconf.h" line="1120"/>
         <source>Focus windows when the mouse pointer moves over them</source>
         <translation>Передавать фокус окнам, когда курсор перемещается над ними</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="938"/>
+        <location filename="../../build/src/ui_obconf.h" line="1121"/>
         <source>&amp;Delay before focusing and raising windows:</source>
         <translation>&amp;Задержка перед передачей курсора и поднятием окна:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="939"/>
+        <location filename="../../build/src/ui_obconf.h" line="1122"/>
         <source>Move focus under the mouse when &amp;switching desktops</source>
         <translation>Передавать фокус под курсор при &amp;переключении рабочих столов</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="940"/>
+        <location filename="../../build/src/ui_obconf.h" line="1123"/>
         <source>Move focus &amp;under the mouse when the mouse is not moving</source>
         <translation>Передавать фокус  &amp;под курсор, когда мышь не двигается</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="941"/>
+        <location filename="../../build/src/ui_obconf.h" line="1124"/>
         <source>&amp;Raise windows when the mouse pointer moves over them</source>
         <translation>&amp;Поднимать окна, когда курсор двигается по ним</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="942"/>
+        <location filename="../../build/src/ui_obconf.h" line="1125"/>
         <source>Titlebar</source>
         <translation>Заголовок окна</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="943"/>
+        <location filename="../../build/src/ui_obconf.h" line="1126"/>
         <source>Double click on the &amp;titlebar:</source>
         <translation>Двойной клик на &amp;заголовке окна:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="946"/>
+        <location filename="../../build/src/ui_obconf.h" line="1129"/>
         <source>Maximizes the window</source>
         <translation>Разворачивает окно</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="947"/>
+        <location filename="../../build/src/ui_obconf.h" line="1130"/>
         <source>Shades the window</source>
         <translation>Сворачивает окно в заголовок</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="949"/>
+        <location filename="../../build/src/ui_obconf.h" line="1132"/>
         <source>Double click ti&amp;me:</source>
         <translation>&amp;Время двойного клика:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="950"/>
+        <location filename="../../build/src/ui_obconf.h" line="1133"/>
         <source>&amp;Show a notification when switching desktops</source>
         <translation>&amp;Показывать уведомление при переключении рабочих столов</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="951"/>
+        <location filename="../../build/src/ui_obconf.h" line="1134"/>
         <source>&amp;Amount of time to show the notification for:</source>
         <translation>&amp;Время, на протяжении которого показывается уведомление:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="952"/>
+        <location filename="../../build/src/ui_obconf.h" line="1135"/>
         <source>&amp;Number of desktops: </source>
         <translation>&amp;Количество рабочих столов: </translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="953"/>
+        <location filename="../../build/src/ui_obconf.h" line="1136"/>
         <source>&amp;Desktop names:</source>
         <translation>Названия &amp;рабочих столов:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="954"/>
+        <location filename="../../build/src/ui_obconf.h" line="1137"/>
         <source>Desktop Margins</source>
         <translation>Границы рабочего стола</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="955"/>
+        <location filename="../../build/src/ui_obconf.h" line="1138"/>
         <source>Desktop margins are reserved areas on the edge of your screen.  New windows will not be placed within a margin, and maximized windows will not cover them.</source>
         <translation>Границы рабочего стола - это зарезервированные зоны по вашего экрана. Новые окна не будут помещены в рамках границ, и развёрнутые окна не перекроют их.</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="956"/>
+        <location filename="../../build/src/ui_obconf.h" line="1139"/>
         <source>Left:</source>
         <translation>Слева:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="957"/>
-        <location filename="../../build/src/ui_obconf.h" line="959"/>
-        <location filename="../../build/src/ui_obconf.h" line="961"/>
-        <location filename="../../build/src/ui_obconf.h" line="963"/>
+        <location filename="../../build/src/ui_obconf.h" line="1140"/>
+        <location filename="../../build/src/ui_obconf.h" line="1142"/>
+        <location filename="../../build/src/ui_obconf.h" line="1144"/>
+        <location filename="../../build/src/ui_obconf.h" line="1146"/>
         <source>px</source>
         <translation>пикс</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="958"/>
+        <location filename="../../build/src/ui_obconf.h" line="1141"/>
         <source>Top:</source>
         <translation>Сверху:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="960"/>
+        <location filename="../../build/src/ui_obconf.h" line="1143"/>
         <source>Right:</source>
         <translation>Справа:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="962"/>
+        <location filename="../../build/src/ui_obconf.h" line="1145"/>
         <source>Bottom:</source>
         <translation>Снизу:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="964"/>
+        <location filename="../../build/src/ui_obconf.h" line="1147"/>
+        <source>The dock is a special container for &quot;dockapps&quot;, or dock applications.  It is not visible on screen until a dockapp is run.  Dockapps can be used to show things like a clock, or to provide you with a system tray.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1148"/>
+        <source>Position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1149"/>
+        <source>&amp;Position:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1152"/>
+        <source>Top Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1153"/>
+        <source>Top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1154"/>
+        <source>Top Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1155"/>
+        <source>Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1156"/>
+        <source>Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1157"/>
+        <source>Bottom Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1158"/>
+        <source>Bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1159"/>
+        <source>Bottom Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1160"/>
+        <source>Floating</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1162"/>
+        <source>&amp;Floating position:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1163"/>
+        <source>x</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1164"/>
+        <source>Allow &amp;windows to be placed within the dock&apos;s area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1165"/>
+        <source>&amp;Orientation: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1168"/>
+        <source>Vertical</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1169"/>
+        <source>Horizontal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1171"/>
+        <source>Stacking</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1172"/>
+        <source>Keep dock &amp;above other windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1173"/>
+        <source>A&amp;llow dock to be both above and below windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1174"/>
+        <source>Keep dock &amp;below other windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1175"/>
+        <source>Hiding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1176"/>
+        <source>&amp;Delay before hiding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1177"/>
+        <source>Delay before &amp;showing:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1178"/>
+        <source>&amp;Hide off screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1179"/>
         <source>About</source>
         <translation>О программе</translation>
     </message>
@@ -457,8 +587,9 @@ D: На все рабочие столы</translation>
 <context>
     <name>Obconf::MainDialog</name>
     <message>
-        <location filename="../desktops.cpp" line="152"/>
-        <location filename="../desktops.cpp" line="162"/>
+        <location filename="../desktops.cpp" line="65"/>
+        <location filename="../desktops.cpp" line="87"/>
+        <location filename="../desktops.cpp" line="99"/>
         <source>(Unnamed desktop)</source>
         <translation>(Неназванный рабочий стол)</translation>
     </message>
@@ -471,6 +602,20 @@ D: На все рабочие столы</translation>
         <location filename="../maindialog.cpp" line="77"/>
         <source>A preferences manager for Openbox
 
+Copyright (c) 2014-2015
+
+Authors:
+* Hong Jen Yee (PCMan) &lt;pcman.tw@gmail.com&gt;
+
+The program is based on ObConf developed by the following developers.
+* Dana Jansens &lt;danakj@orodu.net&gt;
+* Tim Riley &lt;tr@slackzone.org&gt;
+* Javeed Shaikh &lt;syscrash2k@gmail.com&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A preferences manager for Openbox
+
 Copyright (c) 2003-2013
 
 Authors:
@@ -478,7 +623,7 @@ Authors:
 * Dana Jansens &lt;danakj@orodu.net&gt;
 * Tim Riley &lt;tr@slackzone.org&gt;
 * Javeed Shaikh &lt;syscrash2k@gmail.com&gt;</source>
-        <translation>Диспетчер настроек для Openbox
+        <translation type="vanished">Диспетчер настроек для Openbox
 
 Copyright (c) 2003-2013
 

src/translations/obconf-qt_ru_RU.ts

@@ -17,88 +17,88 @@
 <context>
     <name>MainDialog</name>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="829"/>
+        <location filename="../../build/src/ui_obconf.h" line="1012"/>
         <source>Window Manager Preferences</source>
         <translation>Настройки менеджера окон</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="834"/>
+        <location filename="../../build/src/ui_obconf.h" line="1017"/>
         <source>Theme</source>
         <translation>Тема</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="836"/>
+        <location filename="../../build/src/ui_obconf.h" line="1019"/>
         <source>Appearance</source>
         <translation>Внешний вид</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="838"/>
+        <location filename="../../build/src/ui_obconf.h" line="1021"/>
         <source>Font</source>
         <translation>Шрифт</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="840"/>
-        <location filename="../../build/src/ui_obconf.h" line="855"/>
+        <location filename="../../build/src/ui_obconf.h" line="1023"/>
+        <location filename="../../build/src/ui_obconf.h" line="1038"/>
         <source>Windows</source>
         <translation>Окна</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="842"/>
+        <location filename="../../build/src/ui_obconf.h" line="1025"/>
         <source>Move &amp; Resize</source>
         <translation>Перемещение и изменение размера</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="844"/>
+        <location filename="../../build/src/ui_obconf.h" line="1027"/>
         <source>Mouse</source>
         <translation>Мышь</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="846"/>
+        <location filename="../../build/src/ui_obconf.h" line="1029"/>
         <source>Desktops</source>
         <translation>Рабочие столы</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="848"/>
+        <location filename="../../build/src/ui_obconf.h" line="1031"/>
         <source>Margins</source>
         <translation>Границы</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="850"/>
+        <location filename="../../build/src/ui_obconf.h" line="1033"/>
         <source>Dock</source>
         <translation>Док</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="853"/>
+        <location filename="../../build/src/ui_obconf.h" line="1036"/>
         <source>&amp;Install a new theme...</source>
         <translation>&amp;Установить новую тему...</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="854"/>
+        <location filename="../../build/src/ui_obconf.h" line="1037"/>
         <source>Create a theme &amp;archive (.obt)...</source>
         <translation>Создать &amp;архив с темой (.obt)...</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="856"/>
+        <location filename="../../build/src/ui_obconf.h" line="1039"/>
         <source>&amp;Windows retain a border when undecorated</source>
         <translation>&amp;Окна без декораций сохраняют края</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="857"/>
+        <location filename="../../build/src/ui_obconf.h" line="1040"/>
         <source>A&amp;nimate iconify and restore</source>
         <translation>А&amp;нимировать сворачивание и восстановление окна</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="858"/>
+        <location filename="../../build/src/ui_obconf.h" line="1041"/>
         <source>Window Titles</source>
         <translation>Заголовки окна</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="859"/>
+        <location filename="../../build/src/ui_obconf.h" line="1042"/>
         <source>Button order:</source>
         <translation>Порядок кнопок:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="860"/>
+        <location filename="../../build/src/ui_obconf.h" line="1043"/>
         <source>N: Window icon
 L: Window label (Title)
 I: Iconify (Minimize)
@@ -115,341 +115,471 @@ S: Свернуть в заголовок окна
 D: На все рабочие столы</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="873"/>
+        <location filename="../../build/src/ui_obconf.h" line="1056"/>
         <source>&amp;Active window title: </source>
         <translation>Название &amp;активного окна: </translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="874"/>
+        <location filename="../../build/src/ui_obconf.h" line="1057"/>
         <source>&amp;Inactive window title: </source>
         <translation>Название &amp;неактивного окна: </translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="875"/>
+        <location filename="../../build/src/ui_obconf.h" line="1058"/>
         <source>Menu &amp;header: </source>
         <translation>&amp;Заголовок меню: </translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="876"/>
+        <location filename="../../build/src/ui_obconf.h" line="1059"/>
         <source>&amp;Menu Item: </source>
         <translation>Пункт &amp;меню: </translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="877"/>
+        <location filename="../../build/src/ui_obconf.h" line="1060"/>
         <source>Active &amp;On-screen display: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="878"/>
+        <location filename="../../build/src/ui_obconf.h" line="1061"/>
         <source>Inactive O&amp;n-screen display: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="879"/>
+        <location filename="../../build/src/ui_obconf.h" line="1062"/>
         <source>Focus &amp;new windows when they appear</source>
         <translation>Передавать фокус &amp;новым окнам при их возникновении</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="880"/>
+        <location filename="../../build/src/ui_obconf.h" line="1063"/>
         <source>&amp;Place new windows under the mouse pointer</source>
         <translation>&amp;Помещать новые окна под курсором мыши</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="881"/>
+        <location filename="../../build/src/ui_obconf.h" line="1064"/>
         <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"/>
+        <location filename="../../build/src/ui_obconf.h" line="1065"/>
         <source>Prefer to place new windows &amp;on:</source>
         <translation>Предпочитать размещать новое окно &amp;на:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="885"/>
+        <location filename="../../build/src/ui_obconf.h" line="1068"/>
         <source>All monitors</source>
         <translation>Всех мониторах</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="886"/>
+        <location filename="../../build/src/ui_obconf.h" line="1069"/>
         <source>The active monitor</source>
         <translation>Активном мониторе</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="887"/>
+        <location filename="../../build/src/ui_obconf.h" line="1070"/>
         <source>The monitor with the mouse</source>
         <translation>Мониторе с мышью</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="888"/>
+        <location filename="../../build/src/ui_obconf.h" line="1071"/>
         <source>Primary monitor</source>
         <translation>Основном мониторе</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="890"/>
+        <location filename="../../build/src/ui_obconf.h" line="1073"/>
         <source>Primary Monitor</source>
         <translation>Основной монитор</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="891"/>
+        <location filename="../../build/src/ui_obconf.h" line="1074"/>
         <source>The primary monitor is where Openbox will place dialogs, such as the one used for cycling windows.</source>
         <translation>Основной монитор - это область, где Openbox будет размещать диалоги, такие как переключение окон.</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="892"/>
+        <location filename="../../build/src/ui_obconf.h" line="1075"/>
         <source>Primary &amp;monitor:</source>
         <translation>Основной &amp;монитор:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="895"/>
+        <location filename="../../build/src/ui_obconf.h" line="1078"/>
         <source>Fixed Monitor</source>
         <translation>Фиксированный монитор</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="896"/>
+        <location filename="../../build/src/ui_obconf.h" line="1079"/>
         <source>Active Monitor</source>
         <translation>Активный монитор</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="897"/>
+        <location filename="../../build/src/ui_obconf.h" line="1080"/>
         <source>Monitor With Mouse Pointer</source>
         <translation>Монитор с курсором мыши</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="899"/>
+        <location filename="../../build/src/ui_obconf.h" line="1082"/>
         <source>&amp;Fixed monitor:</source>
         <translation>&amp;Фиксированный монитор:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="900"/>
+        <location filename="../../build/src/ui_obconf.h" line="1083"/>
         <source>Moving and Resizing Windows</source>
         <translation>Перемещение и изменение размеров окон</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="901"/>
+        <location filename="../../build/src/ui_obconf.h" line="1084"/>
         <source>Update the window contents while &amp;resizing</source>
         <translation>Обновлять содержимое окна во &amp;время изменения размера</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="902"/>
+        <location filename="../../build/src/ui_obconf.h" line="1085"/>
         <source>Drag &amp;threshold distance:</source>
         <translation>&amp;Порог расстояния перетаскивания:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="903"/>
+        <location filename="../../build/src/ui_obconf.h" line="1086"/>
         <source>Amount of resistance against other &amp;windows:</source>
         <translation>Количество сопротивления к другим &amp;окнам:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="904"/>
+        <location filename="../../build/src/ui_obconf.h" line="1087"/>
         <source>Amount of resistance against screen &amp;edges:</source>
         <translation>Количество сопротивления к &amp;краям экрана:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="905"/>
+        <location filename="../../build/src/ui_obconf.h" line="1088"/>
         <source>&amp;Amount of time to wait before switching:</source>
         <translation>&amp;Время ожидания перед переключением:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="906"/>
+        <location filename="../../build/src/ui_obconf.h" line="1089"/>
         <source>&amp;Switch desktops when moving a window past the screen edge</source>
         <translation>&amp;Переключать рабочие столы при перемещенииокна за границы экрана</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="907"/>
+        <location filename="../../build/src/ui_obconf.h" line="1090"/>
         <source>Information Dialog</source>
         <translation>Информагионный диалог</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="910"/>
-        <location filename="../../build/src/ui_obconf.h" line="917"/>
+        <location filename="../../build/src/ui_obconf.h" line="1093"/>
+        <location filename="../../build/src/ui_obconf.h" line="1100"/>
         <source>Centered</source>
         <translation>По центру</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="911"/>
+        <location filename="../../build/src/ui_obconf.h" line="1094"/>
         <source>From left edge</source>
         <translation>От левого края</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="912"/>
+        <location filename="../../build/src/ui_obconf.h" line="1095"/>
         <source>From right edge</source>
         <translation>От правого края</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="914"/>
+        <location filename="../../build/src/ui_obconf.h" line="1097"/>
         <source>Fixed &amp;y position:</source>
         <translation>Фиксированное по &amp;y:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="918"/>
+        <location filename="../../build/src/ui_obconf.h" line="1101"/>
         <source>From top edge</source>
         <translation>Отверхеней границы</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="919"/>
+        <location filename="../../build/src/ui_obconf.h" line="1102"/>
         <source>From bottom edge</source>
         <translation>От нижней границы</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="921"/>
+        <location filename="../../build/src/ui_obconf.h" line="1104"/>
         <source>Information dialog&apos;s &amp;position:</source>
         <translation>&amp;Расположение информационного диалога:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="922"/>
+        <location filename="../../build/src/ui_obconf.h" line="1105"/>
         <source>Fixed &amp;x position:</source>
         <translation>Фиксированное по &amp;x:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="923"/>
+        <location filename="../../build/src/ui_obconf.h" line="1106"/>
         <source>Show &amp;information dialog:</source>
         <translation>Показывать &amp;информационный диалог:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="926"/>
+        <location filename="../../build/src/ui_obconf.h" line="1109"/>
         <source>When resizing terminal windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="927"/>
+        <location filename="../../build/src/ui_obconf.h" line="1110"/>
         <source>Always</source>
         <translation>Всегда</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="928"/>
+        <location filename="../../build/src/ui_obconf.h" line="1111"/>
         <source>Never</source>
         <translation>Никогда</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="932"/>
+        <location filename="../../build/src/ui_obconf.h" line="1115"/>
         <source>Centered on the window</source>
         <translation>По центру окна</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="933"/>
+        <location filename="../../build/src/ui_obconf.h" line="1116"/>
         <source>Above the window</source>
         <translation>Сверху окна</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="934"/>
+        <location filename="../../build/src/ui_obconf.h" line="1117"/>
         <source>Fixed position on screen</source>
         <translation>Фиксированное место на экране</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="936"/>
+        <location filename="../../build/src/ui_obconf.h" line="1119"/>
         <source>Focusing Windows</source>
         <translation>Передача фокуса окнам</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="937"/>
+        <location filename="../../build/src/ui_obconf.h" line="1120"/>
         <source>Focus windows when the mouse pointer moves over them</source>
         <translation>Передавать фокус окнам, когда курсор перемещается над ними</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="938"/>
+        <location filename="../../build/src/ui_obconf.h" line="1121"/>
         <source>&amp;Delay before focusing and raising windows:</source>
         <translation>&amp;Задержка перед передачей курсора и поднятием окна:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="939"/>
+        <location filename="../../build/src/ui_obconf.h" line="1122"/>
         <source>Move focus under the mouse when &amp;switching desktops</source>
         <translation>Передавать фокус под курсор при &amp;переключении рабочих столов</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="940"/>
+        <location filename="../../build/src/ui_obconf.h" line="1123"/>
         <source>Move focus &amp;under the mouse when the mouse is not moving</source>
         <translation>Передавать фокус  &amp;под курсор, когда мышь не двигается</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="941"/>
+        <location filename="../../build/src/ui_obconf.h" line="1124"/>
         <source>&amp;Raise windows when the mouse pointer moves over them</source>
         <translation>&amp;Поднимать окна, когда курсор двигается по ним</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="942"/>
+        <location filename="../../build/src/ui_obconf.h" line="1125"/>
         <source>Titlebar</source>
         <translation>Заголовок окна</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="943"/>
+        <location filename="../../build/src/ui_obconf.h" line="1126"/>
         <source>Double click on the &amp;titlebar:</source>
         <translation>Двойной клик на &amp;заголовке окна:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="946"/>
+        <location filename="../../build/src/ui_obconf.h" line="1129"/>
         <source>Maximizes the window</source>
         <translation>Разворачивает окно</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="947"/>
+        <location filename="../../build/src/ui_obconf.h" line="1130"/>
         <source>Shades the window</source>
         <translation>Сворачивает окно в заголовок</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="949"/>
+        <location filename="../../build/src/ui_obconf.h" line="1132"/>
         <source>Double click ti&amp;me:</source>
         <translation>&amp;Время двойного клика:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="950"/>
+        <location filename="../../build/src/ui_obconf.h" line="1133"/>
         <source>&amp;Show a notification when switching desktops</source>
         <translation>&amp;Показывать уведомление при переключении рабочих столов</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="951"/>
+        <location filename="../../build/src/ui_obconf.h" line="1134"/>
         <source>&amp;Amount of time to show the notification for:</source>
         <translation>&amp;Время, на протяжении которого показывается уведомление:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="952"/>
+        <location filename="../../build/src/ui_obconf.h" line="1135"/>
         <source>&amp;Number of desktops: </source>
         <translation>&amp;Количество рабочих столов: </translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="953"/>
+        <location filename="../../build/src/ui_obconf.h" line="1136"/>
         <source>&amp;Desktop names:</source>
         <translation>Названия &amp;рабочих столов:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="954"/>
+        <location filename="../../build/src/ui_obconf.h" line="1137"/>
         <source>Desktop Margins</source>
         <translation>Границы рабочего стола</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="955"/>
+        <location filename="../../build/src/ui_obconf.h" line="1138"/>
         <source>Desktop margins are reserved areas on the edge of your screen.  New windows will not be placed within a margin, and maximized windows will not cover them.</source>
         <translation>Границы рабочего стола - это зарезервированные зоны по вашего экрана. Новые окна не будут помещены в рамках границ, и развёрнутые окна не перекроют их.</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="956"/>
+        <location filename="../../build/src/ui_obconf.h" line="1139"/>
         <source>Left:</source>
         <translation>Слева:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="957"/>
-        <location filename="../../build/src/ui_obconf.h" line="959"/>
-        <location filename="../../build/src/ui_obconf.h" line="961"/>
-        <location filename="../../build/src/ui_obconf.h" line="963"/>
+        <location filename="../../build/src/ui_obconf.h" line="1140"/>
+        <location filename="../../build/src/ui_obconf.h" line="1142"/>
+        <location filename="../../build/src/ui_obconf.h" line="1144"/>
+        <location filename="../../build/src/ui_obconf.h" line="1146"/>
         <source>px</source>
         <translation>пикс</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="958"/>
+        <location filename="../../build/src/ui_obconf.h" line="1141"/>
         <source>Top:</source>
         <translation>Сверху:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="960"/>
+        <location filename="../../build/src/ui_obconf.h" line="1143"/>
         <source>Right:</source>
         <translation>Справа:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="962"/>
+        <location filename="../../build/src/ui_obconf.h" line="1145"/>
         <source>Bottom:</source>
         <translation>Снизу:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="964"/>
+        <location filename="../../build/src/ui_obconf.h" line="1147"/>
+        <source>The dock is a special container for &quot;dockapps&quot;, or dock applications.  It is not visible on screen until a dockapp is run.  Dockapps can be used to show things like a clock, or to provide you with a system tray.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1148"/>
+        <source>Position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1149"/>
+        <source>&amp;Position:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1152"/>
+        <source>Top Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1153"/>
+        <source>Top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1154"/>
+        <source>Top Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1155"/>
+        <source>Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1156"/>
+        <source>Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1157"/>
+        <source>Bottom Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1158"/>
+        <source>Bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1159"/>
+        <source>Bottom Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1160"/>
+        <source>Floating</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1162"/>
+        <source>&amp;Floating position:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1163"/>
+        <source>x</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1164"/>
+        <source>Allow &amp;windows to be placed within the dock&apos;s area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1165"/>
+        <source>&amp;Orientation: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1168"/>
+        <source>Vertical</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1169"/>
+        <source>Horizontal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1171"/>
+        <source>Stacking</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1172"/>
+        <source>Keep dock &amp;above other windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1173"/>
+        <source>A&amp;llow dock to be both above and below windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1174"/>
+        <source>Keep dock &amp;below other windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1175"/>
+        <source>Hiding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1176"/>
+        <source>&amp;Delay before hiding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1177"/>
+        <source>Delay before &amp;showing:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1178"/>
+        <source>&amp;Hide off screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1179"/>
         <source>About</source>
         <translation>О программе</translation>
     </message>
@@ -457,8 +587,9 @@ D: На все рабочие столы</translation>
 <context>
     <name>Obconf::MainDialog</name>
     <message>
-        <location filename="../desktops.cpp" line="152"/>
-        <location filename="../desktops.cpp" line="162"/>
+        <location filename="../desktops.cpp" line="65"/>
+        <location filename="../desktops.cpp" line="87"/>
+        <location filename="../desktops.cpp" line="99"/>
         <source>(Unnamed desktop)</source>
         <translation>(Неназванный рабочий стол)</translation>
     </message>
@@ -471,6 +602,20 @@ D: На все рабочие столы</translation>
         <location filename="../maindialog.cpp" line="77"/>
         <source>A preferences manager for Openbox
 
+Copyright (c) 2014-2015
+
+Authors:
+* Hong Jen Yee (PCMan) &lt;pcman.tw@gmail.com&gt;
+
+The program is based on ObConf developed by the following developers.
+* Dana Jansens &lt;danakj@orodu.net&gt;
+* Tim Riley &lt;tr@slackzone.org&gt;
+* Javeed Shaikh &lt;syscrash2k@gmail.com&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A preferences manager for Openbox
+
 Copyright (c) 2003-2013
 
 Authors:
@@ -478,7 +623,7 @@ Authors:
 * Dana Jansens &lt;danakj@orodu.net&gt;
 * Tim Riley &lt;tr@slackzone.org&gt;
 * Javeed Shaikh &lt;syscrash2k@gmail.com&gt;</source>
-        <translation>Диспетчер настроек для Openbox
+        <translation type="vanished">Диспетчер настроек для Openbox
 
 Copyright (c) 2003-2013
 

src/translations/obconf-qt_sv.ts

@@ -17,237 +17,237 @@
 <context>
     <name>MainDialog</name>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="844"/>
+        <location filename="../../build/src/ui_obconf.h" line="1027"/>
         <source>Mouse</source>
         <translation>Mus</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="829"/>
+        <location filename="../../build/src/ui_obconf.h" line="1012"/>
         <source>Window Manager Preferences</source>
         <translation>Inställningar för fönstehanteraren</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="834"/>
+        <location filename="../../build/src/ui_obconf.h" line="1017"/>
         <source>Theme</source>
         <translation>Tema</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="836"/>
+        <location filename="../../build/src/ui_obconf.h" line="1019"/>
         <source>Appearance</source>
         <translation>Utseende</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="838"/>
+        <location filename="../../build/src/ui_obconf.h" line="1021"/>
         <source>Font</source>
         <translation>Teckensnitt</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="840"/>
-        <location filename="../../build/src/ui_obconf.h" line="855"/>
+        <location filename="../../build/src/ui_obconf.h" line="1023"/>
+        <location filename="../../build/src/ui_obconf.h" line="1038"/>
         <source>Windows</source>
         <translation>Fönster</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="842"/>
+        <location filename="../../build/src/ui_obconf.h" line="1025"/>
         <source>Move &amp; Resize</source>
         <translation>Flytta och byt storlek</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="846"/>
+        <location filename="../../build/src/ui_obconf.h" line="1029"/>
         <source>Desktops</source>
         <translation>Skrivbord</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="848"/>
+        <location filename="../../build/src/ui_obconf.h" line="1031"/>
         <source>Margins</source>
         <translation>Marginaler</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="850"/>
+        <location filename="../../build/src/ui_obconf.h" line="1033"/>
         <source>Dock</source>
         <translation>Docka</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="858"/>
+        <location filename="../../build/src/ui_obconf.h" line="1041"/>
         <source>Window Titles</source>
         <translation>Fönsternamn</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="859"/>
+        <location filename="../../build/src/ui_obconf.h" line="1042"/>
         <source>Button order:</source>
         <translation>Knappordning:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="900"/>
+        <location filename="../../build/src/ui_obconf.h" line="1083"/>
         <source>Moving and Resizing Windows</source>
         <translation>Flytta och storleksändra fönster</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="907"/>
+        <location filename="../../build/src/ui_obconf.h" line="1090"/>
         <source>Information Dialog</source>
         <translation>Informationsruta</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="936"/>
+        <location filename="../../build/src/ui_obconf.h" line="1119"/>
         <source>Focusing Windows</source>
         <translation>Fokusera fönster</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="937"/>
+        <location filename="../../build/src/ui_obconf.h" line="1120"/>
         <source>Focus windows when the mouse pointer moves over them</source>
         <translation>Fokusera fönster när muspekaren flyttas över dem</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="942"/>
+        <location filename="../../build/src/ui_obconf.h" line="1125"/>
         <source>Titlebar</source>
         <translation>Namnlist</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="954"/>
+        <location filename="../../build/src/ui_obconf.h" line="1137"/>
         <source>Desktop Margins</source>
         <translation>Marginaler på skrivbordet</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="955"/>
+        <location filename="../../build/src/ui_obconf.h" line="1138"/>
         <source>Desktop margins are reserved areas on the edge of your screen.  New windows will not be placed within a margin, and maximized windows will not cover them.</source>
         <translation>Marginaler på skrivbordet reserveras vid kanten på skärmen.  Nya fönster kommer inte att placeras inom marginalen och maximerade fönster kommer inte att täcka dessa.</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="956"/>
+        <location filename="../../build/src/ui_obconf.h" line="1139"/>
         <source>Left:</source>
         <translation>Vänster:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="957"/>
-        <location filename="../../build/src/ui_obconf.h" line="959"/>
-        <location filename="../../build/src/ui_obconf.h" line="961"/>
-        <location filename="../../build/src/ui_obconf.h" line="963"/>
+        <location filename="../../build/src/ui_obconf.h" line="1140"/>
+        <location filename="../../build/src/ui_obconf.h" line="1142"/>
+        <location filename="../../build/src/ui_obconf.h" line="1144"/>
+        <location filename="../../build/src/ui_obconf.h" line="1146"/>
         <source>px</source>
         <translation>px</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="958"/>
+        <location filename="../../build/src/ui_obconf.h" line="1141"/>
         <source>Top:</source>
         <translation>Överst:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="960"/>
+        <location filename="../../build/src/ui_obconf.h" line="1143"/>
         <source>Right:</source>
         <translation>Höger:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="962"/>
+        <location filename="../../build/src/ui_obconf.h" line="1145"/>
         <source>Bottom:</source>
         <translation>Nederst:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="885"/>
+        <location filename="../../build/src/ui_obconf.h" line="1068"/>
         <source>All monitors</source>
         <translation>Alla bildskärmar</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="886"/>
+        <location filename="../../build/src/ui_obconf.h" line="1069"/>
         <source>The active monitor</source>
         <translation>Aktiv bildskärm</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="887"/>
+        <location filename="../../build/src/ui_obconf.h" line="1070"/>
         <source>The monitor with the mouse</source>
         <translation>Bildskärmen med musen</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="890"/>
+        <location filename="../../build/src/ui_obconf.h" line="1073"/>
         <source>Primary Monitor</source>
         <translation>Primär bildskärm</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="891"/>
+        <location filename="../../build/src/ui_obconf.h" line="1074"/>
         <source>The primary monitor is where Openbox will place dialogs, such as the one used for cycling windows.</source>
         <translation>Primär bildskärm som Openbox ska placera dialogrutor på, exempelvis den som används för rotera genom fönster.</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="895"/>
+        <location filename="../../build/src/ui_obconf.h" line="1078"/>
         <source>Fixed Monitor</source>
         <translation>Fast bildskärm</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="896"/>
+        <location filename="../../build/src/ui_obconf.h" line="1079"/>
         <source>Active Monitor</source>
         <translation>Aktiv bildskärm</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="897"/>
+        <location filename="../../build/src/ui_obconf.h" line="1080"/>
         <source>Monitor With Mouse Pointer</source>
         <translation>Bildskärm med muspekare</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="910"/>
-        <location filename="../../build/src/ui_obconf.h" line="917"/>
+        <location filename="../../build/src/ui_obconf.h" line="1093"/>
+        <location filename="../../build/src/ui_obconf.h" line="1100"/>
         <source>Centered</source>
         <translation>Centrerat</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="911"/>
+        <location filename="../../build/src/ui_obconf.h" line="1094"/>
         <source>From left edge</source>
         <translation>Från vänsterkant</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="912"/>
+        <location filename="../../build/src/ui_obconf.h" line="1095"/>
         <source>From right edge</source>
         <translation>Från högerkant</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="918"/>
+        <location filename="../../build/src/ui_obconf.h" line="1101"/>
         <source>From top edge</source>
         <translation>Från överkant</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="919"/>
+        <location filename="../../build/src/ui_obconf.h" line="1102"/>
         <source>From bottom edge</source>
         <translation>Från nederkant</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="926"/>
+        <location filename="../../build/src/ui_obconf.h" line="1109"/>
         <source>When resizing terminal windows</source>
         <translation>När storlek på terminalfönster ändras</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="927"/>
+        <location filename="../../build/src/ui_obconf.h" line="1110"/>
         <source>Always</source>
         <translation>Alltid</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="928"/>
+        <location filename="../../build/src/ui_obconf.h" line="1111"/>
         <source>Never</source>
         <translation>Aldrig</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="932"/>
+        <location filename="../../build/src/ui_obconf.h" line="1115"/>
         <source>Centered on the window</source>
         <translation>Centrerat på fönster</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="933"/>
+        <location filename="../../build/src/ui_obconf.h" line="1116"/>
         <source>Above the window</source>
         <translation>Ovanför fönster</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="934"/>
+        <location filename="../../build/src/ui_obconf.h" line="1117"/>
         <source>Fixed position on screen</source>
         <translation>Fast position på skärmen</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="946"/>
+        <location filename="../../build/src/ui_obconf.h" line="1129"/>
         <source>Maximizes the window</source>
         <translation>Maximerar fönstret</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="947"/>
+        <location filename="../../build/src/ui_obconf.h" line="1130"/>
         <source>Shades the window</source>
         <translation>Skuggar fönstret</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="860"/>
+        <location filename="../../build/src/ui_obconf.h" line="1043"/>
         <source>N: Window icon
 L: Window label (Title)
 I: Iconify (Minimize)
@@ -264,192 +264,322 @@ S: Rulla upp
 D: På alla skrivbord</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="888"/>
+        <location filename="../../build/src/ui_obconf.h" line="1071"/>
         <source>Primary monitor</source>
         <translation>Primär bildskärm</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="964"/>
+        <location filename="../../build/src/ui_obconf.h" line="1147"/>
+        <source>The dock is a special container for &quot;dockapps&quot;, or dock applications.  It is not visible on screen until a dockapp is run.  Dockapps can be used to show things like a clock, or to provide you with a system tray.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1148"/>
+        <source>Position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1149"/>
+        <source>&amp;Position:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1152"/>
+        <source>Top Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1153"/>
+        <source>Top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1154"/>
+        <source>Top Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1155"/>
+        <source>Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1156"/>
+        <source>Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1157"/>
+        <source>Bottom Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1158"/>
+        <source>Bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1159"/>
+        <source>Bottom Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1160"/>
+        <source>Floating</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1162"/>
+        <source>&amp;Floating position:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1163"/>
+        <source>x</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1164"/>
+        <source>Allow &amp;windows to be placed within the dock&apos;s area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1165"/>
+        <source>&amp;Orientation: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1168"/>
+        <source>Vertical</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1169"/>
+        <source>Horizontal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1171"/>
+        <source>Stacking</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1172"/>
+        <source>Keep dock &amp;above other windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1173"/>
+        <source>A&amp;llow dock to be both above and below windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1174"/>
+        <source>Keep dock &amp;below other windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1175"/>
+        <source>Hiding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1176"/>
+        <source>&amp;Delay before hiding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1177"/>
+        <source>Delay before &amp;showing:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1178"/>
+        <source>&amp;Hide off screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1179"/>
         <source>About</source>
         <translation>Om</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="853"/>
+        <location filename="../../build/src/ui_obconf.h" line="1036"/>
         <source>&amp;Install a new theme...</source>
         <translation>&amp;Installera ett nytt tema...</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="854"/>
+        <location filename="../../build/src/ui_obconf.h" line="1037"/>
         <source>Create a theme &amp;archive (.obt)...</source>
         <translation>Skapa ett tema&amp;arkiv (.obt)...</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="856"/>
+        <location filename="../../build/src/ui_obconf.h" line="1039"/>
         <source>&amp;Windows retain a border when undecorated</source>
         <translation>&amp;Fönster behåller kan även utan dekoration</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="857"/>
+        <location filename="../../build/src/ui_obconf.h" line="1040"/>
         <source>A&amp;nimate iconify and restore</source>
         <translation>A&amp;nimera ikonifiering och återställning</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="873"/>
+        <location filename="../../build/src/ui_obconf.h" line="1056"/>
         <source>&amp;Active window title: </source>
         <translation>&amp;Aktiv fönstertitel: </translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="874"/>
+        <location filename="../../build/src/ui_obconf.h" line="1057"/>
         <source>&amp;Inactive window title: </source>
         <translation>&amp;Inaktiv fönstertitel: </translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="875"/>
+        <location filename="../../build/src/ui_obconf.h" line="1058"/>
         <source>Menu &amp;header: </source>
         <translation>&amp;Huvudmeny: </translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="876"/>
+        <location filename="../../build/src/ui_obconf.h" line="1059"/>
         <source>&amp;Menu Item: </source>
         <translation>&amp;Menyalternativ: </translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="877"/>
+        <location filename="../../build/src/ui_obconf.h" line="1060"/>
         <source>Active &amp;On-screen display: </source>
         <translation>Aktiv &amp;On-screen-display: </translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="878"/>
+        <location filename="../../build/src/ui_obconf.h" line="1061"/>
         <source>Inactive O&amp;n-screen display: </source>
         <translation>Inaktiv O&amp;n-screen-display: </translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="879"/>
+        <location filename="../../build/src/ui_obconf.h" line="1062"/>
         <source>Focus &amp;new windows when they appear</source>
         <translation>Fokusera &amp;nya fönster när de dyker upp</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="880"/>
+        <location filename="../../build/src/ui_obconf.h" line="1063"/>
         <source>&amp;Place new windows under the mouse pointer</source>
         <translation>&amp;Placera nya fönster under muspekaren</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="881"/>
+        <location filename="../../build/src/ui_obconf.h" line="1064"/>
         <source>&amp;Center new windows when they are placed</source>
         <translation>&amp;Centrera nya fönster när de placeras</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="882"/>
+        <location filename="../../build/src/ui_obconf.h" line="1065"/>
         <source>Prefer to place new windows &amp;on:</source>
         <translation>Föredra att placera nya fönster &amp;på:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="892"/>
+        <location filename="../../build/src/ui_obconf.h" line="1075"/>
         <source>Primary &amp;monitor:</source>
         <translation>Primär &amp;bildskärm:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="899"/>
+        <location filename="../../build/src/ui_obconf.h" line="1082"/>
         <source>&amp;Fixed monitor:</source>
         <translation>&amp;Fast bildskräm:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="901"/>
+        <location filename="../../build/src/ui_obconf.h" line="1084"/>
         <source>Update the window contents while &amp;resizing</source>
         <translation>Uppdatera fönsterinnehåll när det ändrar &amp;storlek</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="902"/>
+        <location filename="../../build/src/ui_obconf.h" line="1085"/>
         <source>Drag &amp;threshold distance:</source>
         <translation>&amp;Tröskelvärde för distans att dra:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="903"/>
+        <location filename="../../build/src/ui_obconf.h" line="1086"/>
         <source>Amount of resistance against other &amp;windows:</source>
         <translation>Motstånd mot andra &amp;fönster:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="904"/>
+        <location filename="../../build/src/ui_obconf.h" line="1087"/>
         <source>Amount of resistance against screen &amp;edges:</source>
         <translation>Motstånd mot &amp;skärmkanten:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="905"/>
+        <location filename="../../build/src/ui_obconf.h" line="1088"/>
         <source>&amp;Amount of time to wait before switching:</source>
         <translation>&amp;Tid att vänta innan byte:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="906"/>
+        <location filename="../../build/src/ui_obconf.h" line="1089"/>
         <source>&amp;Switch desktops when moving a window past the screen edge</source>
         <translation>&amp;Byt skrivbord när fönster flyttas över kanten</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="914"/>
+        <location filename="../../build/src/ui_obconf.h" line="1097"/>
         <source>Fixed &amp;y position:</source>
         <translation>Fast &amp;y-position:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="921"/>
+        <location filename="../../build/src/ui_obconf.h" line="1104"/>
         <source>Information dialog&apos;s &amp;position:</source>
         <translation>Informationsrutans &amp;position:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="922"/>
+        <location filename="../../build/src/ui_obconf.h" line="1105"/>
         <source>Fixed &amp;x position:</source>
         <translation>Fast &amp;x-position:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="923"/>
+        <location filename="../../build/src/ui_obconf.h" line="1106"/>
         <source>Show &amp;information dialog:</source>
         <translation>Visa &amp;informationsruta:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="938"/>
+        <location filename="../../build/src/ui_obconf.h" line="1121"/>
         <source>&amp;Delay before focusing and raising windows:</source>
         <translation>&amp;Dröj innan fokusering och framhävning av fönster:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="939"/>
+        <location filename="../../build/src/ui_obconf.h" line="1122"/>
         <source>Move focus under the mouse when &amp;switching desktops</source>
         <translation>Flytta fokus under musen när &amp;skrivbordsbyte sker</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="940"/>
+        <location filename="../../build/src/ui_obconf.h" line="1123"/>
         <source>Move focus &amp;under the mouse when the mouse is not moving</source>
         <translation>Flytta fokus &amp;under musen när musen inte flyttas</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="941"/>
+        <location filename="../../build/src/ui_obconf.h" line="1124"/>
         <source>&amp;Raise windows when the mouse pointer moves over them</source>
         <translation>&amp;Framhäv fönster när muspekaren flyttas över de</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="943"/>
+        <location filename="../../build/src/ui_obconf.h" line="1126"/>
         <source>Double click on the &amp;titlebar:</source>
         <translation>Dubbelklick på fönstertiteln:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="949"/>
+        <location filename="../../build/src/ui_obconf.h" line="1132"/>
         <source>Double click ti&amp;me:</source>
         <translation>Tid för &amp;dubbelklick:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="950"/>
+        <location filename="../../build/src/ui_obconf.h" line="1133"/>
         <source>&amp;Show a notification when switching desktops</source>
         <translation>Vi&amp;sa notifiering vid byte av skrivbord</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="951"/>
+        <location filename="../../build/src/ui_obconf.h" line="1134"/>
         <source>&amp;Amount of time to show the notification for:</source>
         <translation>&amp;Tid som notifiering visas:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="952"/>
+        <location filename="../../build/src/ui_obconf.h" line="1135"/>
         <source>&amp;Number of desktops: </source>
         <translation>&amp;Antal skrivbord: </translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="953"/>
+        <location filename="../../build/src/ui_obconf.h" line="1136"/>
         <source>&amp;Desktop names:</source>
         <translation>&amp;Skrivbordsnamn:</translation>
     </message>
@@ -462,8 +592,9 @@ D: På alla skrivbord</translation>
         <translation>Anpassade åtgärder</translation>
     </message>
     <message>
-        <location filename="../desktops.cpp" line="152"/>
-        <location filename="../desktops.cpp" line="162"/>
+        <location filename="../desktops.cpp" line="65"/>
+        <location filename="../desktops.cpp" line="87"/>
+        <location filename="../desktops.cpp" line="99"/>
         <source>(Unnamed desktop)</source>
         <translation>(Skrivbord utan namn)</translation>
     </message>
@@ -476,6 +607,20 @@ D: På alla skrivbord</translation>
         <location filename="../maindialog.cpp" line="77"/>
         <source>A preferences manager for Openbox
 
+Copyright (c) 2014-2015
+
+Authors:
+* Hong Jen Yee (PCMan) &lt;pcman.tw@gmail.com&gt;
+
+The program is based on ObConf developed by the following developers.
+* Dana Jansens &lt;danakj@orodu.net&gt;
+* Tim Riley &lt;tr@slackzone.org&gt;
+* Javeed Shaikh &lt;syscrash2k@gmail.com&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A preferences manager for Openbox
+
 Copyright (c) 2003-2013
 
 Authors:
@@ -483,7 +628,7 @@ Authors:
 * Dana Jansens &lt;danakj@orodu.net&gt;
 * Tim Riley &lt;tr@slackzone.org&gt;
 * Javeed Shaikh &lt;syscrash2k@gmail.com&gt;</source>
-        <translation>Inställningshanterare för Openbox
+        <translation type="vanished">Inställningshanterare för Openbox
 
 Copyright (c) 2003-2013
 

src/translations/obconf-qt_uk.ts

@@ -17,237 +17,237 @@
 <context>
     <name>MainDialog</name>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="844"/>
+        <location filename="../../build/src/ui_obconf.h" line="1027"/>
         <source>Mouse</source>
         <translation>Мишка</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="829"/>
+        <location filename="../../build/src/ui_obconf.h" line="1012"/>
         <source>Window Manager Preferences</source>
         <translation>Параметри менеджера файлів</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="834"/>
+        <location filename="../../build/src/ui_obconf.h" line="1017"/>
         <source>Theme</source>
         <translation>Тема</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="836"/>
+        <location filename="../../build/src/ui_obconf.h" line="1019"/>
         <source>Appearance</source>
         <translation>Вигляд</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="838"/>
+        <location filename="../../build/src/ui_obconf.h" line="1021"/>
         <source>Font</source>
         <translation>Шрифт</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="840"/>
-        <location filename="../../build/src/ui_obconf.h" line="855"/>
+        <location filename="../../build/src/ui_obconf.h" line="1023"/>
+        <location filename="../../build/src/ui_obconf.h" line="1038"/>
         <source>Windows</source>
         <translation>Вікна</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="842"/>
+        <location filename="../../build/src/ui_obconf.h" line="1025"/>
         <source>Move &amp; Resize</source>
         <translation>Перемістити і Змінити розмір</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="846"/>
+        <location filename="../../build/src/ui_obconf.h" line="1029"/>
         <source>Desktops</source>
         <translation>Стільниці</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="848"/>
+        <location filename="../../build/src/ui_obconf.h" line="1031"/>
         <source>Margins</source>
         <translation>Поля</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="850"/>
+        <location filename="../../build/src/ui_obconf.h" line="1033"/>
         <source>Dock</source>
         <translation>Док</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="858"/>
+        <location filename="../../build/src/ui_obconf.h" line="1041"/>
         <source>Window Titles</source>
         <translation>Заголовки вікон</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="859"/>
+        <location filename="../../build/src/ui_obconf.h" line="1042"/>
         <source>Button order:</source>
         <translation>Послідовність кнопок</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="900"/>
+        <location filename="../../build/src/ui_obconf.h" line="1083"/>
         <source>Moving and Resizing Windows</source>
         <translation>Пересування і зміна розмірів вікон</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="907"/>
+        <location filename="../../build/src/ui_obconf.h" line="1090"/>
         <source>Information Dialog</source>
         <translation>Діалог інформації</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="936"/>
+        <location filename="../../build/src/ui_obconf.h" line="1119"/>
         <source>Focusing Windows</source>
         <translation>Фокусування вікон</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="937"/>
+        <location filename="../../build/src/ui_obconf.h" line="1120"/>
         <source>Focus windows when the mouse pointer moves over them</source>
         <translation>Фокусування вікон, якщо вказівник миші знаходиться над ними</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="942"/>
+        <location filename="../../build/src/ui_obconf.h" line="1125"/>
         <source>Titlebar</source>
         <translation>Заголовок</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="954"/>
+        <location filename="../../build/src/ui_obconf.h" line="1137"/>
         <source>Desktop Margins</source>
         <translation>Поля стільниці</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="955"/>
+        <location filename="../../build/src/ui_obconf.h" line="1138"/>
         <source>Desktop margins are reserved areas on the edge of your screen.  New windows will not be placed within a margin, and maximized windows will not cover them.</source>
         <translation>Поля робочого столу - це зарезервовані ділянки на краю Вашого екрану. Нові вікна не будуть поміщені за цими межами, а максимізовані вікна не будуть закривати їх.</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="956"/>
+        <location filename="../../build/src/ui_obconf.h" line="1139"/>
         <source>Left:</source>
         <translation>Ліворуч:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="957"/>
-        <location filename="../../build/src/ui_obconf.h" line="959"/>
-        <location filename="../../build/src/ui_obconf.h" line="961"/>
-        <location filename="../../build/src/ui_obconf.h" line="963"/>
+        <location filename="../../build/src/ui_obconf.h" line="1140"/>
+        <location filename="../../build/src/ui_obconf.h" line="1142"/>
+        <location filename="../../build/src/ui_obconf.h" line="1144"/>
+        <location filename="../../build/src/ui_obconf.h" line="1146"/>
         <source>px</source>
         <translation>пікселів</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="958"/>
+        <location filename="../../build/src/ui_obconf.h" line="1141"/>
         <source>Top:</source>
         <translation>Згори:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="960"/>
+        <location filename="../../build/src/ui_obconf.h" line="1143"/>
         <source>Right:</source>
         <translation>Праворуч:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="962"/>
+        <location filename="../../build/src/ui_obconf.h" line="1145"/>
         <source>Bottom:</source>
         <translation>Знизу:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="885"/>
+        <location filename="../../build/src/ui_obconf.h" line="1068"/>
         <source>All monitors</source>
         <translation>Всі монітори</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="886"/>
+        <location filename="../../build/src/ui_obconf.h" line="1069"/>
         <source>The active monitor</source>
         <translation>Активний монітор</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="887"/>
+        <location filename="../../build/src/ui_obconf.h" line="1070"/>
         <source>The monitor with the mouse</source>
         <translation>Монітор з мишкою</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="890"/>
+        <location filename="../../build/src/ui_obconf.h" line="1073"/>
         <source>Primary Monitor</source>
         <translation>Головний монітор</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="891"/>
+        <location filename="../../build/src/ui_obconf.h" line="1074"/>
         <source>The primary monitor is where Openbox will place dialogs, such as the one used for cycling windows.</source>
         <translation>Головний монітор - це монітор, де Openbox поміщає діалоги, наприклад, як діалог прокрутки вікон.</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="895"/>
+        <location filename="../../build/src/ui_obconf.h" line="1078"/>
         <source>Fixed Monitor</source>
         <translation>Фіксований монітор</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="896"/>
+        <location filename="../../build/src/ui_obconf.h" line="1079"/>
         <source>Active Monitor</source>
         <translation>Активний монітор</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="897"/>
+        <location filename="../../build/src/ui_obconf.h" line="1080"/>
         <source>Monitor With Mouse Pointer</source>
         <translation>Монітор з вказівником миші</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="910"/>
-        <location filename="../../build/src/ui_obconf.h" line="917"/>
+        <location filename="../../build/src/ui_obconf.h" line="1093"/>
+        <location filename="../../build/src/ui_obconf.h" line="1100"/>
         <source>Centered</source>
         <translation>У центрі</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="911"/>
+        <location filename="../../build/src/ui_obconf.h" line="1094"/>
         <source>From left edge</source>
         <translation>Від лівого краю</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="912"/>
+        <location filename="../../build/src/ui_obconf.h" line="1095"/>
         <source>From right edge</source>
         <translation>Від правого краю</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="918"/>
+        <location filename="../../build/src/ui_obconf.h" line="1101"/>
         <source>From top edge</source>
         <translation>Від верхнього краю</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="919"/>
+        <location filename="../../build/src/ui_obconf.h" line="1102"/>
         <source>From bottom edge</source>
         <translation>Від нижнього краю</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="926"/>
+        <location filename="../../build/src/ui_obconf.h" line="1109"/>
         <source>When resizing terminal windows</source>
         <translation>При зміні розмірів термінального вікна</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="927"/>
+        <location filename="../../build/src/ui_obconf.h" line="1110"/>
         <source>Always</source>
         <translation>Завжди</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="928"/>
+        <location filename="../../build/src/ui_obconf.h" line="1111"/>
         <source>Never</source>
         <translation>Ніколи</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="932"/>
+        <location filename="../../build/src/ui_obconf.h" line="1115"/>
         <source>Centered on the window</source>
         <translation>Центровано на вікні</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="933"/>
+        <location filename="../../build/src/ui_obconf.h" line="1116"/>
         <source>Above the window</source>
         <translation>Над вікном</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="934"/>
+        <location filename="../../build/src/ui_obconf.h" line="1117"/>
         <source>Fixed position on screen</source>
         <translation>Фіксована позиція на екрані</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="946"/>
+        <location filename="../../build/src/ui_obconf.h" line="1129"/>
         <source>Maximizes the window</source>
         <translation>Максимізує вікно</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="947"/>
+        <location filename="../../build/src/ui_obconf.h" line="1130"/>
         <source>Shades the window</source>
         <translation>Затіняє вікно</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="860"/>
+        <location filename="../../build/src/ui_obconf.h" line="1043"/>
         <source>N: Window icon
 L: Window label (Title)
 I: Iconify (Minimize)
@@ -264,192 +264,322 @@ S: Затінити (Згорнути)
 D: Розмістити всюди (На всіх стільницях)</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="888"/>
+        <location filename="../../build/src/ui_obconf.h" line="1071"/>
         <source>Primary monitor</source>
         <translation>Головний монітор</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="964"/>
+        <location filename="../../build/src/ui_obconf.h" line="1147"/>
+        <source>The dock is a special container for &quot;dockapps&quot;, or dock applications.  It is not visible on screen until a dockapp is run.  Dockapps can be used to show things like a clock, or to provide you with a system tray.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1148"/>
+        <source>Position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1149"/>
+        <source>&amp;Position:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1152"/>
+        <source>Top Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1153"/>
+        <source>Top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1154"/>
+        <source>Top Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1155"/>
+        <source>Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1156"/>
+        <source>Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1157"/>
+        <source>Bottom Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1158"/>
+        <source>Bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1159"/>
+        <source>Bottom Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1160"/>
+        <source>Floating</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1162"/>
+        <source>&amp;Floating position:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1163"/>
+        <source>x</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1164"/>
+        <source>Allow &amp;windows to be placed within the dock&apos;s area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1165"/>
+        <source>&amp;Orientation: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1168"/>
+        <source>Vertical</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1169"/>
+        <source>Horizontal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1171"/>
+        <source>Stacking</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1172"/>
+        <source>Keep dock &amp;above other windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1173"/>
+        <source>A&amp;llow dock to be both above and below windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1174"/>
+        <source>Keep dock &amp;below other windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1175"/>
+        <source>Hiding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1176"/>
+        <source>&amp;Delay before hiding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1177"/>
+        <source>Delay before &amp;showing:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1178"/>
+        <source>&amp;Hide off screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../build/src/ui_obconf.h" line="1179"/>
         <source>About</source>
         <translation>Про</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="853"/>
+        <location filename="../../build/src/ui_obconf.h" line="1036"/>
         <source>&amp;Install a new theme...</source>
         <translation>&amp;Встановити нову тему...</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="854"/>
+        <location filename="../../build/src/ui_obconf.h" line="1037"/>
         <source>Create a theme &amp;archive (.obt)...</source>
         <translation>Створити &amp;архів теми (.obt)...</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="856"/>
+        <location filename="../../build/src/ui_obconf.h" line="1039"/>
         <source>&amp;Windows retain a border when undecorated</source>
         <translation>&amp;Вікна зберігають границі, коли є без оформлення</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="857"/>
+        <location filename="../../build/src/ui_obconf.h" line="1040"/>
         <source>A&amp;nimate iconify and restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="873"/>
+        <location filename="../../build/src/ui_obconf.h" line="1056"/>
         <source>&amp;Active window title: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="874"/>
+        <location filename="../../build/src/ui_obconf.h" line="1057"/>
         <source>&amp;Inactive window title: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="875"/>
+        <location filename="../../build/src/ui_obconf.h" line="1058"/>
         <source>Menu &amp;header: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="876"/>
+        <location filename="../../build/src/ui_obconf.h" line="1059"/>
         <source>&amp;Menu Item: </source>
         <translation>П&amp;ункт меню:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="877"/>
+        <location filename="../../build/src/ui_obconf.h" line="1060"/>
         <source>Active &amp;On-screen display: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="878"/>
+        <location filename="../../build/src/ui_obconf.h" line="1061"/>
         <source>Inactive O&amp;n-screen display: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="879"/>
+        <location filename="../../build/src/ui_obconf.h" line="1062"/>
         <source>Focus &amp;new windows when they appear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="880"/>
+        <location filename="../../build/src/ui_obconf.h" line="1063"/>
         <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"/>
+        <location filename="../../build/src/ui_obconf.h" line="1064"/>
         <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"/>
+        <location filename="../../build/src/ui_obconf.h" line="1065"/>
         <source>Prefer to place new windows &amp;on:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="892"/>
+        <location filename="../../build/src/ui_obconf.h" line="1075"/>
         <source>Primary &amp;monitor:</source>
         <translation>Головний &amp;монітор:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="899"/>
+        <location filename="../../build/src/ui_obconf.h" line="1082"/>
         <source>&amp;Fixed monitor:</source>
         <translation>&amp;Фіксований монітор:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="901"/>
+        <location filename="../../build/src/ui_obconf.h" line="1084"/>
         <source>Update the window contents while &amp;resizing</source>
         <translation>Оновлювати вміст вікна при &amp;зміні розміру</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="902"/>
+        <location filename="../../build/src/ui_obconf.h" line="1085"/>
         <source>Drag &amp;threshold distance:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="903"/>
+        <location filename="../../build/src/ui_obconf.h" line="1086"/>
         <source>Amount of resistance against other &amp;windows:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="904"/>
+        <location filename="../../build/src/ui_obconf.h" line="1087"/>
         <source>Amount of resistance against screen &amp;edges:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="905"/>
+        <location filename="../../build/src/ui_obconf.h" line="1088"/>
         <source>&amp;Amount of time to wait before switching:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="906"/>
+        <location filename="../../build/src/ui_obconf.h" line="1089"/>
         <source>&amp;Switch desktops when moving a window past the screen edge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="914"/>
+        <location filename="../../build/src/ui_obconf.h" line="1097"/>
         <source>Fixed &amp;y position:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="921"/>
+        <location filename="../../build/src/ui_obconf.h" line="1104"/>
         <source>Information dialog&apos;s &amp;position:</source>
         <translation>&amp;Позиція інформаційного діалогу:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="922"/>
+        <location filename="../../build/src/ui_obconf.h" line="1105"/>
         <source>Fixed &amp;x position:</source>
         <translation>Фіксована &amp;x позиція:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="923"/>
+        <location filename="../../build/src/ui_obconf.h" line="1106"/>
         <source>Show &amp;information dialog:</source>
         <translation>Показати &amp;інформаційний діалог:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="938"/>
+        <location filename="../../build/src/ui_obconf.h" line="1121"/>
         <source>&amp;Delay before focusing and raising windows:</source>
         <translation>Затримка перед &amp;фокусуванням і розгортанням вікна:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="939"/>
+        <location filename="../../build/src/ui_obconf.h" line="1122"/>
         <source>Move focus under the mouse when &amp;switching desktops</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="940"/>
+        <location filename="../../build/src/ui_obconf.h" line="1123"/>
         <source>Move focus &amp;under the mouse when the mouse is not moving</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="941"/>
+        <location filename="../../build/src/ui_obconf.h" line="1124"/>
         <source>&amp;Raise windows when the mouse pointer moves over them</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="943"/>
+        <location filename="../../build/src/ui_obconf.h" line="1126"/>
         <source>Double click on the &amp;titlebar:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="949"/>
+        <location filename="../../build/src/ui_obconf.h" line="1132"/>
         <source>Double click ti&amp;me:</source>
         <translation>Час подвійного &amp;клацання:</translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="950"/>
+        <location filename="../../build/src/ui_obconf.h" line="1133"/>
         <source>&amp;Show a notification when switching desktops</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="951"/>
+        <location filename="../../build/src/ui_obconf.h" line="1134"/>
         <source>&amp;Amount of time to show the notification for:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="952"/>
+        <location filename="../../build/src/ui_obconf.h" line="1135"/>
         <source>&amp;Number of desktops: </source>
         <translation>Кількість &amp;стільниць: </translation>
     </message>
     <message>
-        <location filename="../../build/src/ui_obconf.h" line="953"/>
+        <location filename="../../build/src/ui_obconf.h" line="1136"/>
         <source>&amp;Desktop names:</source>
         <translation>&amp;Назви стільниць:</translation>
     </message>
@@ -462,8 +592,9 @@ D: Розмістити всюди (На всіх стільницях)</transla
         <translation>Дії користувача</translation>
     </message>
     <message>
-        <location filename="../desktops.cpp" line="152"/>
-        <location filename="../desktops.cpp" line="162"/>
+        <location filename="../desktops.cpp" line="65"/>
+        <location filename="../desktops.cpp" line="87"/>
+        <location filename="../desktops.cpp" line="99"/>
         <source>(Unnamed desktop)</source>
         <translation>(Стільниця без назви)</translation>
     </message>
@@ -476,6 +607,20 @@ D: Розмістити всюди (На всіх стільницях)</transla
         <location filename="../maindialog.cpp" line="77"/>
         <source>A preferences manager for Openbox
 
+Copyright (c) 2014-2015
+
+Authors:
+* Hong Jen Yee (PCMan) &lt;pcman.tw@gmail.com&gt;
+
+The program is based on ObConf developed by the following developers.
+* Dana Jansens &lt;danakj@orodu.net&gt;
+* Tim Riley &lt;tr@slackzone.org&gt;
+* Javeed Shaikh &lt;syscrash2k@gmail.com&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A preferences manager for Openbox
+
 Copyright (c) 2003-2013
 
 Authors:
@@ -483,7 +628,7 @@ Authors:
 * Dana Jansens &lt;danakj@orodu.net&gt;
 * Tim Riley &lt;tr@slackzone.org&gt;
 * Javeed Shaikh &lt;syscrash2k@gmail.com&gt;</source>
-        <translation>Менеджер налаштувань для Openbox
+        <translation type="vanished">Менеджер налаштувань для Openbox
 
 Всі права застережено (c) 2003-2013