6 files changed, 19 insertions, 4 deletions

diff --git a/res/values-cs/cm_strings.xml b/res/values-cs/cm_strings.xml
index 0236f2d..142387c 100644
--- a/res/values-cs/cm_strings.xml
+++ b/res/values-cs/cm_strings.xml
@@ -101,6 +101,8 @@
     <string name="preferences_interface_dock_pages_summary">Počet stránek v doku</string>
     <string name="preferences_interface_dock_icons_title">Ikony</string>
     <string name="preferences_interface_dock_icons_summary">Počet ikon/sloupců v doku</string>
+    <string name="preferences_interface_dock_hide_icon_labels_title">Skrýt popisky ikon</string>
+    <string name="preferences_interface_dock_hide_icon_labels_summary">Skrýt popisky ikon v doku</string>
     <string name="preferences_interface_dock_icon_scale_title">Změnšení ikon</string>
     <string name="preferences_interface_dock_icon_scale_summary">Změnšení ikon v doku</string>
     <string name="preferences_interface_dock_divider_title">Zobrazit oddělovač doku</string>
diff --git a/res/values-es/cm_strings.xml b/res/values-es/cm_strings.xml
index 98d6d87..45ebe74 100644
--- a/res/values-es/cm_strings.xml
+++ b/res/values-es/cm_strings.xml
@@ -99,6 +99,8 @@
     <string name="preferences_interface_dock_default_page_summary">Establecer la página por defecto</string>
     <string name="preferences_interface_dock_icons_title">Número de iconos</string>
     <string name="preferences_interface_dock_icons_summary">Establecer el número de iconos que se mostrarán</string>
+    <string name="preferences_interface_dock_hide_icon_labels_title">Ocultar etiquetas</string>
+    <string name="preferences_interface_dock_hide_icon_labels_summary">Ocultar las etiquetas de los iconos de la barra de aplicaciones</string>
     <string name="preferences_interface_dock_icon_scale_title">Tamaño de iconos</string>
     <string name="preferences_interface_dock_icon_scale_summary">Establecer la escala para los iconos</string>
     <string name="preferences_interface_dock_divider_title">Separador</string>
diff --git a/res/values-it/cm_strings.xml b/res/values-it/cm_strings.xml
index b5163a1..e43d7b5 100644
--- a/res/values-it/cm_strings.xml
+++ b/res/values-it/cm_strings.xml
@@ -99,6 +99,8 @@
     <string name="preferences_interface_dock_default_page_summary">Pagina che viene mostrata di default</string>
     <string name="preferences_interface_dock_icons_title">Icone</string>
     <string name="preferences_interface_dock_icons_summary">Numero di icone/colonne nella barra dock</string>
+    <string name="preferences_interface_dock_hide_icon_labels_title">Nascondi etichette</string>
+    <string name="preferences_interface_dock_hide_icon_labels_summary">Nascondi le etichette delle icone nella barra dock</string>
     <string name="preferences_interface_dock_icon_scale_title">Scala icone</string>
     <string name="preferences_interface_dock_icon_scale_summary">Scala delle icone nella barra dock</string>
     <string name="preferences_interface_dock_divider_title">Mostra divisore dock</string>
diff --git a/res/values-pt/cm_strings.xml b/res/values-pt/cm_strings.xml
index 1747bef..83488f2 100644
--- a/res/values-pt/cm_strings.xml
+++ b/res/values-pt/cm_strings.xml
@@ -125,4 +125,6 @@
     <string name="workspace_locked">Tela incial está bloqueada, desbloqueie nas configurações para modificá-la</string>
     <string name="preferences_interface_general_lock_workspace_title">Bloquear tela inicial</string>
     <string name="preferences_interface_general_lock_workspace_summary">Bloqueia posições dos atalhos e pastas na tela inicial, dock e aplicativos e gaveta de widgets</string>
+    <string name="preferences_interface_dock_hide_icon_labels_title">Esconder rótulos dos ícones</string>
+    <string name="preferences_interface_dock_hide_icon_labels_summary">Esconder rótulos dos ícones do dock</string>
 </resources>
\ No newline at end of file
diff --git a/res/values-ru/cm_strings.xml b/res/values-ru/cm_strings.xml
index afd0059..635cad6 100644
--- a/res/values-ru/cm_strings.xml
+++ b/res/values-ru/cm_strings.xml
@@ -111,6 +111,8 @@
     <string name="preferences_interface_dock_default_page_summary">Выбор страницы по умолчанию</string>
     <string name="preferences_interface_dock_icons_title">Иконки</string>
     <string name="preferences_interface_dock_icons_summary">Количество иконок/колонок в нижней панели</string>
+    <string name="preferences_interface_dock_hide_icon_labels_title">Прятать подписи иконок</string>
+    <string name="preferences_interface_dock_hide_icon_labels_summary">Прятать подписи иконок в нижней панели</string>
     <string name="preferences_interface_dock_icon_scale_title">Масштаб иконок</string>
     <string name="preferences_interface_dock_icon_scale_summary">Масштабирование иконок в нижней панели</string>
     <string name="preferences_interface_dock_divider_title">Показывать разделитель</string>
diff --git a/src/com/cyanogenmod/trebuchet/PagedView.java b/src/com/cyanogenmod/trebuchet/PagedView.java
index 42ae968..5090f8d 100644
--- a/src/com/cyanogenmod/trebuchet/PagedView.java
+++ b/src/com/cyanogenmod/trebuchet/PagedView.java
@@ -320,14 +320,19 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
      */
     protected void updateCurrentPageScroll() {
         // If the current page is invalid, just reset the scroll position to zero
-        int newX = 0;
+        int newScrollPos = 0;
         if (0 <= mCurrentPage && mCurrentPage < getPageCount()) {
             int offset = getChildOffset(mCurrentPage);
             int relOffset = getRelativeChildOffset(mCurrentPage);
-            newX = offset - relOffset;
+            newScrollPos = offset - relOffset;
+        }
+        if (!mVertical) {
+            scrollTo(newScrollPos, 0);
+            mScroller.setFinalX(newScrollPos);
+        } else {
+            scrollTo(0, newScrollPos);
+            mScroller.setFinalY(newScrollPos);
         }
-        scrollTo(newX, 0);
-        mScroller.setFinalX(newX);
         mScroller.forceFinished(true);
     }