summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--res/values-da/strings.xml54
-rw-r--r--res/values-es/strings.xml10
-rw-r--r--res/values-ru/strings.xml29
-rw-r--r--res/values-zh-rCN/strings.xml24
-rw-r--r--src/com/cyanogenmod/trebuchet/AppsCustomizePagedView.java22
-rw-r--r--src/com/cyanogenmod/trebuchet/DeleteDropTarget.java5
-rw-r--r--src/com/cyanogenmod/trebuchet/EditDropTarget.java5
-rw-r--r--src/com/cyanogenmod/trebuchet/InfoDropTarget.java5
8 files changed, 136 insertions, 18 deletions
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 2f661559c..0fcdc368b 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -119,11 +119,23 @@
<string name="cancel_target_label">Annuller</string>
+ <!-- Label for the info icon. [CHAR_LIMIT=30] -->
+ <string name="edit_target_label">Rediger</string>
+
+ <!-- Hidden apps -->
+ <string name="hidden_apps_title">Skjulte apps</string>
+
+ <!-- Menu button text. -->
+ <string name="menu">Menu</string>
+
<!-- Menus items: -->
<!-- Noun, menu item used to show the launcher preferences -->
<string name="menu_preferences">Trebuchet-indstillinger</string>
<string name="menu_apps_sort_title">Navn</string>
<string name="menu_apps_sort_install_date">Installationsdato</string>
+ <string name="menu_apps_filter_system">System</string>
+ <string name="menu_apps_filter_downloaded">Downloadet</string>
+ <string name="menu_hidden_apps_delete">Nulstil</string>
<!-- Clings -->
<string name="all_apps_sort_cling_title">Sortér dine apps</string>
@@ -139,6 +151,7 @@
<!-- UI -->
<!-- Homescreen -->
<string name="preferences_interface_homescreen_title">Startskærm</string>
+ <string name="preferences_interface_homescreen_summary">Skærme og tapet</string>
<string name="preferences_interface_homescreen_general_category">Generelt</string>
<string name="preferences_interface_homescreen_general_screens_title">Startskærme</string>
<string name="preferences_interface_homescreen_general_screens_summary">Antallet af skærme på startskærmen</string>
@@ -149,35 +162,67 @@
<string name="preferences_interface_homescreen_general_grid_summary">Vælg antallet af rækker/kolonner på startskærmen</string>
<string name="preferences_interface_homescreen_general_grid_rows_title">Rækker</string>
<string name="preferences_interface_homescreen_general_grid_columns_title">Kolonner</string>
+ <string name="preferences_interface_homescreen_general_stretch_screens_title">Stræk skærme</string>
+ <string name="preferences_interface_homescreen_general_stretch_screens_summary">Udvid startskærme til at fylde størrelsen på skærmen</string>
<string name="preferences_interface_homescreen_general_search_summary">Aktivér vedvarende søgefelt</string>
<string name="preferences_interface_homescreen_general_resize_any_widget_title">Ændre størrelse på enhver widget</string>
<string name="preferences_interface_homescreen_general_resize_any_widget_summary">Tillader ændring af størrelsen på widgets, der normalt ikke kan ændres</string>
<string name="preferences_interface_homescreen_general_hide_icon_labels_title">Skjul ikontekst</string>
<string name="preferences_interface_homescreen_general_hide_icon_labels_summary">Skjul ikontekster på startskærmene</string>
<string name="preferences_interface_homescreen_scrolling_category">Bladring</string>
+ <string name="preferences_interface_homescreen_scrolling_transition_effect_title">Overgangseffekt</string>
+ <string name="preferences_interface_homescreen_scrolling_transition_effect_summary">Bladringseffekt, når startskærme bladres</string>
<string name="preferences_interface_homescreen_scrolling_scroll_wallpaper_title">Rul tapet</string>
<string name="preferences_interface_homescreen_scrolling_scroll_wallpaper_summary">Rul tapetet ved bladring mellem startskærme</string>
+ <string name="preferences_interface_homescreen_scrolling_wallpaper_hack_title">Hurtig rendering af tapet</string>
+ <string name="preferences_interface_homescreen_scrolling_wallpaper_hack_summary">Brug hack til tapet, der øger glathed på statiske tapetbilleder</string>
+ <string name="preferences_interface_homescreen_scrolling_wallpaper_size_title">Tapetets størrelse</string>
+ <string name="preferences_interface_homescreen_scrolling_wallpaper_size_summary">Hvor mange skærmbredder skal tapetet være</string>
+ <string name="preferences_interface_homescreen_scrolling_fade_adjacent_screens_title">Udton sideskærme</string>
+ <string name="preferences_interface_homescreen_scrolling_fade_adjacent_screens_summary">Udton sideskærme, når startskærme bladres</string>
+ <string name="preferences_interface_homescreen_scrolling_show_outlines_title">Vis konturer</string>
+ <string name="preferences_interface_homescreen_scrolling_show_outlines_summary">Vis skærmkonturer, når startskærme bladres</string>
<string name="preferences_interface_homescreen_indicator_category">Indikator</string>
<string name="preferences_interface_homescreen_indicator_enable_title">Vis sideindikator</string>
<string name="preferences_interface_homescreen_indicator_enable_summary">Viser den aktuelle side nederst på skærmen</string>
<string name="preferences_interface_homescreen_indicator_fade_title">Udton indikator</string>
<string name="preferences_interface_homescreen_indicator_fade_summary">Udtoner indikatoren efter skift mellem startskærmene</string>
+ <string name="preferences_interface_homescreen_indicator_position_title">Position for indikator</string>
+ <string name="preferences_interface_homescreen_indicator_position_summary">Vælg, hvor indikatoren skal vises på skærmen</string>
<!-- Drawer -->
- <string name="preferences_interface_drawer_title">Applikationer</string>
+ <string name="preferences_interface_drawer_title">Skuffe</string>
+ <string name="preferences_interface_drawer_summary">Skuffe til apps og widgets</string>
+ <string name="preferences_interface_drawer_orientation_title">Orientering</string>
+ <string name="preferences_interface_drawer_orientation_summary">Vælg hvilken retning, skuffen bladrer</string>
+ <string name="preferences_interface_drawer_hidden_apps_title">Skjulte apps</string>
+ <string name="preferences_interface_drawer_hidden_apps_summary">Skjul apps fra skuffen</string>
<string name="preferences_interface_drawer_widgets_category">Widgets</string>
<string name="preferences_interface_drawer_widgets_join_apps_title">Sammen med apps</string>
<string name="preferences_interface_drawer_widgets_join_apps_summary">Glid fra applikationer til widgets uden at skifte fane</string>
+ <string name="preferences_interface_drawer_scrolling_category">Bladring</string>
+ <string name="preferences_interface_drawer_scrolling_transition_effect_title">Overgangseffekt</string>
+ <string name="preferences_interface_drawer_scrolling_transition_effect_summary">Bladringseffekt, når skærme bladres</string>
+ <string name="preferences_interface_drawer_scrolling_fade_adjacent_screens_title">Udton sider</string>
+ <string name="preferences_interface_drawer_scrolling_fade_adjacent_screens_summary">Udton siderne, når skærme bladres</string>
<string name="preferences_interface_drawer_indicator_category">Indikator</string>
<string name="preferences_interface_drawer_indicator_enable_title">Vis sideindikator</string>
<string name="preferences_interface_drawer_indicator_enable_summary">Viser den aktuelle side nederst på skærmen</string>
<string name="preferences_interface_drawer_indicator_fade_title">Udton indikator</string>
<string name="preferences_interface_drawer_indicator_fade_summary">Udtoner indikatoren efter skift mellem siderne</string>
+ <string name="preferences_interface_drawer_indicator_position_title">Position for indikator</string>
+ <string name="preferences_interface_drawer_indicator_position_summary">Vælg, hvor indikatoren skal vises på skærmen</string>
<!-- Dock -->
<string name="preferences_interface_dock_title">Startlinjen</string>
- <string name="preferences_interface_dock_divider_title">Vis startlinjeadskillelse</string>
- <string name="preferences_interface_dock_divider_summary">Adskiller startlinjen fra baggrunden</string>
+ <string name="preferences_interface_dock_pages_title">Sider</string>
+ <string name="preferences_interface_dock_pages_summary">Antal sider i startlinjen</string>
+ <string name="preferences_interface_dock_default_page_title">Standardside</string>
+ <string name="preferences_interface_dock_default_page_summary">Vælg standardsiden</string>
+ <string name="preferences_interface_dock_icons_title">Ikoner</string>
+ <string name="preferences_interface_dock_icons_summary">Antal ikoner/kolonner i startlinjen</string>
+ <string name="preferences_interface_dock_divider_title">Vis skillelinje for startlinje</string>
+ <string name="preferences_interface_dock_divider_summary">Vis skillelinje mellem startskærm og startlinje</string>
<!-- Icons -->
<string name="preferences_interface_icons_title">Ikoner</string>
@@ -185,6 +230,9 @@
<!-- General -->
<string name="preferences_interface_general_title">Generelt</string>
<string name="preferences_interface_general_orientation_title">Rotér skærm automatisk</string>
+ <string name="preferences_interface_general_fullscreen_title">Fuldskærmstilstand</string>
+ <string name="preferences_interface_general_fullscreen_summary">Skjul statuslinjen for at udvide startskærmen</string>
<!-- Trebuchet additional danish translation end -->
</resources>
+
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index c373a4160..1ab955a04 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -189,11 +189,13 @@
<string name="preferences_interface_drawer_indicator_position_summary">Establecer dónde se mostrará el indicador de página</string>
<string name="preferences_interface_dock_title">Barra de aplicaciones</string>
<string name="preferences_interface_dock_pages_title">Páginas</string>
- <string name="preferences_interface_dock_pages_summary">Número de páginas en la barra de aplicaciones</string>
+ <string name="preferences_interface_dock_pages_summary">Establecer el número de páginas</string>
<string name="preferences_interface_dock_default_page_title">Página por defecto</string>
- <string name="preferences_interface_dock_default_page_summary">Escoger la página por defecto</string>
- <string name="preferences_interface_dock_icons_title">Iconos</string>
- <string name="preferences_interface_dock_icons_summary">Número de iconos en la barra de aplicaciones</string>
+ <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_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>
<string name="preferences_interface_dock_divider_summary">Mostrar una línea divisoria sobre la barra de aplicaciones</string>
<string name="preferences_interface_icons_title">Iconos</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 7860b6266..f8df10c89 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -57,6 +57,7 @@
<string name="cancel_target_label">Отмена</string>
<string name="delete_target_uninstall_label" msgid="748894921183769150">"Удалить"</string>
<string name="info_target_label" msgid="4019495079517426980">"Сведения о приложении"</string>
+ <string name="edit_target_label">Изменить</string>
<string name="accessibility_search_button" msgid="816822994629942611">"Поиск"</string>
<string name="accessibility_voice_search_button" msgid="3938249215065842475">"Голосовой поиск"</string>
<string name="accessibility_all_apps_button" msgid="8803738611398979849">"Приложения"</string>
@@ -68,6 +69,7 @@
<string name="menu_search" msgid="4826514464423239041">"Поиск"</string>
<string name="menu_notifications" msgid="6424587053194766192">"Уведомления"</string>
<string name="menu_settings" msgid="3946232973327980394">"Настройки"</string>
+ <string name="menu_preferences">Настройки Trebuchet</string>
<string name="menu_help" msgid="4901160661634590633">"Справка"</string>
<string name="menu_apps_sort_title">По имени</string>
<string name="menu_apps_sort_install_date">По дате установки</string>
@@ -117,6 +119,9 @@
<string name="custom_workspace_cling_title_2" msgid="5516006164661020362"></string>
<string name="custom_workspace_cling_description_2" msgid="2758258454975288377"></string>
+ <!-- Hidden apps -->
+ <string name="hidden_apps_title">Скрытые приложения</string>
+
<!-- -->
<!-- Preferences -->
<!-- -->
@@ -173,6 +178,8 @@
<string name="preferences_interface_drawer_summary">Настройки главного меню и виджетов</string>
<string name="preferences_interface_drawer_orientation_title">Ориентация</string>
<string name="preferences_interface_drawer_orientation_summary">Выбор типа прокрутки главного меню</string>
+ <string name="preferences_interface_drawer_hidden_apps_title">Скрытые приложения</string>
+ <string name="preferences_interface_drawer_hidden_apps_summary">Список скрытых приложений в главном меню</string>
<string name="preferences_interface_drawer_widgets_category">ВИДЖЕТЫ</string>
<string name="preferences_interface_drawer_widgets_join_apps_title">Вместе с приложениями</string>
<string name="preferences_interface_drawer_widgets_join_apps_summary">Пролистывать из меню \"Приложения\" в меню \"Виджеты\" без смены вкладок</string>
@@ -197,6 +204,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_icon_scale_title">Масштаб иконок</string>
+ <string name="preferences_interface_dock_icon_scale_summary">Масштабирование иконок в нижней панели</string>
<string name="preferences_interface_dock_divider_title">Показывать разделитель</string>
<string name="preferences_interface_dock_divider_summary">Отображать разделитель между рабочим столом и нижней панелью</string>
@@ -206,4 +215,24 @@
<!-- General -->
<string name="preferences_interface_general_title">Основные</string>
<string name="preferences_interface_general_orientation_title">Автоповорот экрана</string>
+ <string name="preferences_interface_general_fullscreen_title">Полноэкранный режим</string>
+ <string name="preferences_interface_general_fullscreen_summary">Скрывать строку состояния для увеличения площади домашних экранов</string>
+
+ <!-- Koush steals yachts -->
+ <string-array name="preferences_koush">
+ <item>Koush крадёт яхты!!!!</item>
+ <item>Koush крадёт яхты!!!!</item>
+ <item>Koush крадёт яхты!!!!</item>
+ <item>Koush крадёт яхты!!!!</item>
+ <item>Я надеюсь, что вы наступите на LEGO!!!!</item>
+ <item>Эта настройка здесь, \"потому что мы можем\"</item>
+ <item>На мой взгляд не плохо, но кто-то должен утвердить</item>
+ <item>Мне кажется, лучше не отправлять это</item>
+ <item>ПОЧЕМУ ВЫ НЕ СПИТЕ В 3 ЧАСА УТРА!!!!</item>
+ <item>Не отправлять</item>
+ <item>&lt;cdesai&gt; настройки кажутся маленькими</item>
+ <item>&lt;cdesai&gt; размер настроек</item>
+ <item>&lt;nebkat&gt; что же я должен сделать?</item>
+ <item>&lt;nebkat&gt; заполни пространство этим \"Koush крадёт яхты!!!!\"?</item>
+ </string-array>
</resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 927e3facb..5c1940c22 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -30,6 +30,8 @@
<string name="widgets_tab_label" msgid="9145860100000983599">"小部件"</string>
<string name="long_press_widget_to_add" msgid="7395697462851217506">"触摸并按住可选取小部件。"</string>
<string name="market" msgid="2652226429823445833">"购买"</string>
+ <!-- Menu button text. -->
+ <string name="menu">菜单</string>
<string name="external_drop_widget_error" msgid="2285187188524172774">"无法将项拖放到此主屏幕上。"</string>
<string name="external_drop_widget_pick_title" msgid="7040647073452295370">"选择要创建的小部件"</string>
<string name="rename_folder_label" msgid="5646236631298452787">"文件夹名称"</string>
@@ -209,12 +211,16 @@
<!-- Dock -->
<string name="preferences_interface_dock_title">底座</string>
+ <string name="preferences_interface_dock_enabled_title">显示底座</string>
+ <string name="preferences_interface_dock_enabled_summary">显示在主屏幕下部的底座</string>
<string name="preferences_interface_dock_pages_title">页面</string>
<string name="preferences_interface_dock_pages_summary">设置底座页面数</string>
<string name="preferences_interface_dock_default_page_title">默认页面</string>
<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_icon_scale_title">图标比例</string>
+ <string name="preferences_interface_dock_icon_scale_summary">设置底座上图标的比例</string>
<string name="preferences_interface_dock_divider_title">显示底座分隔器</string>
<string name="preferences_interface_dock_divider_summary">显示指示器后面的背景</string>
@@ -226,4 +232,22 @@
<string name="preferences_interface_general_orientation_title">自动旋转屏幕</string>
<string name="preferences_interface_general_fullscreen_title">全屏模式</string>
<string name="preferences_interface_general_fullscreen_summary">隐藏状态栏以便扩展主屏幕</string>
+
+ <!-- Koush steals yachts -->
+ <string-array name="preferences_koush">
+ <item>Koush 会偷游艇!!!!</item>
+ <item>Koush 会偷游艇!!!!</item>
+ <item>Koush 会偷游艇!!!!</item>
+ <item>Koush 会偷游艇!!!!</item>
+ <item>我希望你会踩到 LEGO!!!!</item>
+ <item>为什么这些设置在这里? 因为 \"我们可以这么做\"</item>
+ <item>我看起来没问题, 但需要另一位的认可</item>
+ <item>我希望您不提交这个</item>
+ <item>为什么你凌晨3点还没睡!!!!</item>
+ <item>不要提交</item>
+ <item>&lt;cdesai&gt; 设置感觉有点空</item>
+ <item>&lt;cdesai&gt; 可能是因为选项的大小吧</item>
+ <item>&lt;nebkat&gt; 你要我怎么处理?</item>
+ <item>&lt;nebkat&gt; 把剩余的空间用 \"Koush 会偷游艇\" 填满?</item>
+ </string-array>
</resources>
diff --git a/src/com/cyanogenmod/trebuchet/AppsCustomizePagedView.java b/src/com/cyanogenmod/trebuchet/AppsCustomizePagedView.java
index 8e52d4195..8d4e4d791 100644
--- a/src/com/cyanogenmod/trebuchet/AppsCustomizePagedView.java
+++ b/src/com/cyanogenmod/trebuchet/AppsCustomizePagedView.java
@@ -1978,8 +1978,13 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen
float scrollProgress = getScrollProgress(screenScroll, v, i);
float scale = 1.0f - Math.abs(scrollProgress);
- v.setPivotX(scrollProgress < 0 ? 0 : v.getMeasuredWidth());
- v.setScaleX(scale);
+ if (!mVertical) {
+ v.setPivotX(scrollProgress < 0 ? 0 : v.getMeasuredWidth());
+ v.setScaleX(scale);
+ } else {
+ v.setPivotY(scrollProgress < 0 ? 0 : v.getMeasuredHeight());
+ v.setScaleY(scale);
+ }
if (mFadeInAdjacentScreens) {
float alpha = 1 - Math.abs(scrollProgress);
@@ -2051,9 +2056,16 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen
float scrollProgress = getScrollProgress(screenScroll, v, i);
float rotation = (in ? TRANSITION_SCREEN_ROTATION : -TRANSITION_SCREEN_ROTATION) * scrollProgress;
- v.setPivotX((scrollProgress + 1) * v.getMeasuredWidth() * 0.5f);
- v.setPivotY(v.getMeasuredHeight() * 0.5f);
- v.setRotationY(rotation);
+ if (!mVertical) {
+ v.setPivotX((scrollProgress + 1) * v.getMeasuredWidth() * 0.5f);
+ v.setPivotY(v.getMeasuredHeight() * 0.5f);
+ v.setRotationY(rotation);
+ } else {
+ v.setPivotY((scrollProgress + 1) * v.getMeasuredHeight() * 0.5f);
+ v.setPivotX(v.getMeasuredWidth() * 0.5f);
+ v.setRotationX(-rotation);
+ }
+
if (mFadeInAdjacentScreens) {
float alpha = 1 - Math.abs(scrollProgress);
v.setAlpha(alpha);
diff --git a/src/com/cyanogenmod/trebuchet/DeleteDropTarget.java b/src/com/cyanogenmod/trebuchet/DeleteDropTarget.java
index d98fd6225..e985ef5f0 100644
--- a/src/com/cyanogenmod/trebuchet/DeleteDropTarget.java
+++ b/src/com/cyanogenmod/trebuchet/DeleteDropTarget.java
@@ -89,10 +89,11 @@ public class DeleteDropTarget extends ButtonDropTarget {
mRemoveActiveDrawable = r.getDrawable(R.drawable.ic_launcher_clear_active_holo);
mRemoveNormalDrawable = r.getDrawable(R.drawable.ic_launcher_clear_normal_holo);
- // Remove the text in the Phone UI in landscape
+ // Remove the text in landscape
int orientation = getResources().getConfiguration().orientation;
+ boolean transposeLayout = getResources().getBoolean(R.bool.hotseat_transpose_layout_with_orientation);
if (orientation == Configuration.ORIENTATION_LANDSCAPE) {
- if (!LauncherApplication.isScreenLarge()) {
+ if (transposeLayout) {
setText("");
}
}
diff --git a/src/com/cyanogenmod/trebuchet/EditDropTarget.java b/src/com/cyanogenmod/trebuchet/EditDropTarget.java
index 7089ef4b6..5ea8ccddc 100644
--- a/src/com/cyanogenmod/trebuchet/EditDropTarget.java
+++ b/src/com/cyanogenmod/trebuchet/EditDropTarget.java
@@ -53,10 +53,11 @@ public class EditDropTarget extends ButtonDropTarget {
mDrawable = (TransitionDrawable) getCurrentDrawable();
mDrawable.setCrossFadeEnabled(true);
- // Remove the text in the Phone UI in landscape
+ // Remove the text in landscape
int orientation = getResources().getConfiguration().orientation;
+ boolean transposeLayout = getResources().getBoolean(R.bool.hotseat_transpose_layout_with_orientation);
if (orientation == Configuration.ORIENTATION_LANDSCAPE) {
- if (!LauncherApplication.isScreenLarge()) {
+ if (transposeLayout) {
setText("");
}
}
diff --git a/src/com/cyanogenmod/trebuchet/InfoDropTarget.java b/src/com/cyanogenmod/trebuchet/InfoDropTarget.java
index 941a29466..eaef23ea8 100644
--- a/src/com/cyanogenmod/trebuchet/InfoDropTarget.java
+++ b/src/com/cyanogenmod/trebuchet/InfoDropTarget.java
@@ -51,10 +51,11 @@ public class InfoDropTarget extends ButtonDropTarget {
mDrawable = (TransitionDrawable) getCurrentDrawable();
mDrawable.setCrossFadeEnabled(true);
- // Remove the text in the Phone UI in landscape
+ // Remove the text in landscape
int orientation = getResources().getConfiguration().orientation;
+ boolean transposeLayout = getResources().getBoolean(R.bool.hotseat_transpose_layout_with_orientation);
if (orientation == Configuration.ORIENTATION_LANDSCAPE) {
- if (!LauncherApplication.isScreenLarge()) {
+ if (transposeLayout) {
setText("");
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 21:24:18 +0000