Skip to content

Commit f507ec1

Browse files
committed
Integration with XServer XSDL
Former-commit-id: a59ced5
1 parent c764f99 commit f507ec1

File tree

15 files changed

+87
-55
lines changed

15 files changed

+87
-55
lines changed

CHANGELOG

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ Changelog (English)
55
Added an option to change the chroot directory
66
Added unchroot script
77
Implemented integration with Android
8+
Implemented integration with XServer XSDL
89

910
1.5.2
1011
Added support Slackware
@@ -312,6 +313,7 @@ Updated list packages of base system installation
312313
Добавлена опция изменения chroot директории
313314
Добавлен скрипт unchroot
314315
Реализована интеграция с Android
316+
Реализована интеграция с XServer XSDL
315317

316318
1.5.2
317319
Добавлена поддержка Slackware

res/values-de/strings.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,8 @@
170170
<string name="dialog_title_xdisplay_preference">X: Bildschirm Nummer</string>
171171
<string name="title_xhost_preference">X Server Addrese</string>
172172
<string name="dialog_title_xhost_preference">X: IP oder Host Name</string>
173+
<string name="title_xserverxsdl_preference">XServer XSDL</string>
174+
<string name="summary_xserverxsdl_preference">Automatically open XServer XSDL</string>
173175
<string name="fb_preferences">Framebuffer</string>
174176
<string name="title_fbdisplay_preference">Bildschirm</string>
175177
<string name="dialog_title_fbdisplay_preference">FB: Bildschirm Nummer</string>

res/values-es/strings.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,8 @@
170170
<string name="dialog_title_xdisplay_preference">X: número pantalla</string>
171171
<string name="title_xhost_preference">X server Dirección</string>
172172
<string name="dialog_title_xhost_preference">X: IP o hombre host</string>
173+
<string name="title_xserverxsdl_preference">XServer XSDL</string>
174+
<string name="summary_xserverxsdl_preference">Automatically open XServer XSDL</string>
173175
<string name="fb_preferences">Framebuffer</string>
174176
<string name="title_fbdisplay_preference">Pantalla</string>
175177
<string name="dialog_title_fbdisplay_preference">FB: numero pantalla</string>

res/values-it/strings.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,8 @@
170170
<string name="dialog_title_xdisplay_preference">Numero schermo X:</string>
171171
<string name="title_xhost_preference">Indirizzo server X</string>
172172
<string name="dialog_title_xhost_preference">IP o nome host X:</string>
173+
<string name="title_xserverxsdl_preference">XServer XSDL</string>
174+
<string name="summary_xserverxsdl_preference">Automatically open XServer XSDL</string>
173175
<string name="fb_preferences">Framebuffer</string>
174176
<string name="title_fbdisplay_preference">Schermo</string>
175177
<string name="dialog_title_fbdisplay_preference">Numero schermo FB:</string>

res/values-ru/strings.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,8 @@
170170
<string name="dialog_title_xdisplay_preference">X: номер дисплея</string>
171171
<string name="title_xhost_preference">Адрес X-сервера</string>
172172
<string name="dialog_title_xhost_preference">X: IP или имя хоста</string>
173+
<string name="title_xserverxsdl_preference">XServer XSDL</string>
174+
<string name="summary_xserverxsdl_preference">Автоматически открывать XServer XSDL</string>
173175
<string name="fb_preferences">Framebuffer</string>
174176
<string name="title_fbdisplay_preference">Номер дисплея</string>
175177
<string name="dialog_title_fbdisplay_preference">FB: номер дисплея</string>

res/values-vi/strings.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,8 @@
170170
<string name="dialog_title_xdisplay_preference">X: số hiển thị</string>
171171
<string name="title_xhost_preference">Địa chỉ máy chủ X</string>
172172
<string name="dialog_title_xhost_preference">X: IP hoặc tên máy chủ</string>
173+
<string name="title_xserverxsdl_preference">XServer XSDL</string>
174+
<string name="summary_xserverxsdl_preference">Automatically open XServer XSDL</string>
173175
<string name="fb_preferences">Framebuffer</string>
174176
<string name="title_fbdisplay_preference">Hiển thị</string>
175177
<string name="dialog_title_fbdisplay_preference">FB: hiển thị số</string>

res/values-zh/strings.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,8 @@
170170
<string name="dialog_title_xdisplay_preference">X: 窗口序号</string>
171171
<string name="title_xhost_preference">X11 服务器地址</string>
172172
<string name="dialog_title_xhost_preference">X: IP地址或域名</string>
173+
<string name="title_xserverxsdl_preference">XServer XSDL</string>
174+
<string name="summary_xserverxsdl_preference">Automatically open XServer XSDL</string>
173175
<string name="fb_preferences">Framebuffer</string>
174176
<string name="title_fbdisplay_preference">显示</string>
175177
<string name="dialog_title_fbdisplay_preference">FB: 窗口序号</string>

res/values/preferences.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<string name="customstartup" translatable="false">false</string>
3636
<string name="scripts" translatable="false">/etc/init.d/myscript</string>
3737
<string name="custommount" translatable="false">false</string>
38-
<string name="mounts" translatable="false">{storage} /system</string>
38+
<string name="mounts" translatable="false">/system {storage}</string>
3939
<string name="guistartup" translatable="false">true</string>
4040
<string name="guitype" translatable="false">vnc</string>
4141
<string name="sshstartup" translatable="false">true</string>
@@ -48,6 +48,7 @@
4848
<string name="vncargs" translatable="false"></string>
4949
<string name="xdisplay" translatable="false">0</string>
5050
<string name="xhost" translatable="false">127.0.0.1</string>
51+
<string name="xserverxsdl" translatable="false">false</string>
5152
<string name="fbdisplay" translatable="false">0</string>
5253
<string name="fbdpi" translatable="false">100</string>
5354
<string name="fbdev" translatable="false">/dev/graphics/fb0</string>

res/values/strings.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,8 @@
170170
<string name="dialog_title_xdisplay_preference">X: display number</string>
171171
<string name="title_xhost_preference">X server address</string>
172172
<string name="dialog_title_xhost_preference">X: IP or host name</string>
173+
<string name="title_xserverxsdl_preference">XServer XSDL</string>
174+
<string name="summary_xserverxsdl_preference">Automatically open XServer XSDL</string>
173175
<string name="fb_preferences">Framebuffer</string>
174176
<string name="title_fbdisplay_preference">Display</string>
175177
<string name="dialog_title_fbdisplay_preference">FB: display number</string>

res/xml/properties_xserver.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@
1515
android:key="xhost"
1616
android:summary="@string/xhost"
1717
android:title="@string/title_xhost_preference" />
18+
<CheckBoxPreference
19+
android:defaultValue="@string/xserverxsdl"
20+
android:key="xserverxsdl"
21+
android:summary="@string/summary_xserverxsdl_preference"
22+
android:title="@string/title_xserverxsdl_preference" />
1823
</PreferenceCategory>
1924

2025
</PreferenceScreen>

0 commit comments

Comments
 (0)