Add files using upload-large-folder tool

local-test-freerdp-delta-01/afc-freerdp/client/Android/Studio/freeRDPCore/src/main/res/layout/bookmark_list_item.xml

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+/*
+ Copyright (C) 2007 Google Inc.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+-->
+
+<TwoLineListItem xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content">
+
+    <ImageView
+        android:id="@+id/bookmark_icon1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:contentDescription="@+id/bookmark_icon1"
+        android:visibility="gone" />
+
+    <TextView
+        android:id="@+id/bookmark_text1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="6dip"
+        android:layout_marginTop="6dip"
+        android:layout_toRightOf="@id/bookmark_icon1"
+        android:textAppearance="?android:attr/textAppearanceLarge" />
+
+    <TextView
+        android:id="@+id/bookmark_text2"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignLeft="@id/bookmark_text1"
+        android:layout_below="@id/bookmark_text1"
+        android:paddingBottom="4dip"
+        android:textAppearance="?android:attr/textAppearanceSmall" />
+
+    <ImageView
+        android:id="@+id/bookmark_icon2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_centerVertical="true"
+        android:layout_marginRight="7dip"
+        android:layout_marginTop="9dip"
+        android:contentDescription="@+id/bookmark_icon2"
+        android:focusable="false"
+        android:focusableInTouchMode="false"
+        android:src="@drawable/icon_star_off" />
+</TwoLineListItem>

local-test-freerdp-delta-01/afc-freerdp/client/Android/Studio/freeRDPCore/src/main/res/layout/button_preference.xml

@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+/*
+   Layout for custom preference item showing a button on the right side
+
+   Copyright 2013 Thincast Technologies GmbH, Author: Martin Fleisz
+
+   This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. 
+   If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
+*/
+ -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:baselineAligned="false"
+    android:gravity="center_vertical"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:paddingRight="?android:attr/scrollbarSize">
+
+    <RelativeLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="6dip"
+        android:layout_marginLeft="15dip"
+        android:layout_marginRight="6dip"
+        android:layout_marginTop="6dip"
+        android:layout_weight="1">
+
+        <TextView
+            android:id="@android:id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="marquee"
+            android:fadingEdge="horizontal"
+            android:singleLine="true"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <TextView
+            android:id="@android:id/summary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignLeft="@android:id/title"
+            android:layout_below="@android:id/title"
+            android:maxLines="4"
+            android:textAppearance="?android:attr/textAppearanceSmall" />
+
+    </RelativeLayout>
+
+    <!-- Preference should place its actual preference widget here. -->
+    <LinearLayout
+        android:id="@android:id/widget_frame"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:gravity="center_vertical"
+        android:orientation="vertical">
+
+        <Button
+            android:id="@+id/preference_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/login" />
+    </LinearLayout>
+</LinearLayout>

local-test-freerdp-delta-01/afc-freerdp/client/Android/Studio/freeRDPCore/src/main/res/layout/credentials.xml

@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+/*
+   Layout for user credentials input
+
+   Copyright 2013 Thincast Technologies GmbH, Author: Martin Fleisz
+
+   This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. 
+   If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
+*/
+ -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@android:id/empty"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/settings_username"
+        android:textAppearance="@android:style/TextAppearance.Medium" />
+
+    <EditText
+        android:id="@+id/editTextUsername"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:inputType="text"
+        android:singleLine="true" />
+
+    <TextView
+        android:id="@android:id/empty"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/settings_password"
+        android:textAppearance="@android:style/TextAppearance.Medium" />
+
+    <EditText
+        android:id="@+id/editTextPassword"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:inputType="textPassword"
+        android:singleLine="true" />
+
+    <TextView
+        android:id="@android:id/empty"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/settings_domain"
+        android:textAppearance="@android:style/TextAppearance.Medium" />
+
+    <EditText
+        android:id="@+id/editTextDomain"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:inputType="text"
+        android:singleLine="true" />
+
+</LinearLayout>

local-test-freerdp-delta-01/afc-freerdp/client/Android/Studio/freeRDPCore/src/main/res/layout/dont_show_again_dialog.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+/*
+   Layout for dialogs with a "Don't show again" checkbox
+
+   Copyright 2013 Thincast Technologies GmbH, Author: Martin Fleisz
+
+   This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. 
+   If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
+*/
+ -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/message"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:maxLines="3"
+        android:padding="5dip"
+        android:scrollbars="vertical"
+        android:singleLine="false"
+        android:textAppearance="?android:attr/textAppearanceMediumInverse" />
+
+    <CheckBox
+        android:id="@+id/checkBox"
+        style="?android:attr/textAppearanceMediumInverse"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/dlg_dont_show_again"></CheckBox>
+
+</LinearLayout>

local-test-freerdp-delta-01/afc-freerdp/client/Android/Studio/freeRDPCore/src/main/res/layout/list_header.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+/*
+   List header layout
+
+   Copyright 2013 Thincast Technologies GmbH, Author: Martin Fleisz
+
+   This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. 
+   If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
+*/
+ -->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/list_header_title"
+    style="?android:attr/listSeparatorTextViewStyle"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/separator_background"
+    android:paddingBottom="2dip"
+    android:paddingLeft="5dip"
+    android:paddingTop="2dip"
+    android:textColor="@color/separator_text_color" />

local-test-freerdp-delta-01/afc-freerdp/client/Android/Studio/freeRDPCore/src/main/res/layout/session.xml

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+/*
+   Session screen layout
+
+   Copyright 2013 Thincast Technologies GmbH, Author: Martin Fleisz
+
+   This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. 
+   If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
+*/
+ -->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/session_root_view"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <!-- children are specified bottom-up so that we have a correct z-order in our final layout -->
+    <android.inputmethodservice.KeyboardView
+        android:id="@+id/extended_keyboard"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:visibility="gone" />
+
+    <com.freerdp.freerdpcore.presentation.ScrollView2D
+        android:id="@+id/sessionScrollView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_above="@id/extended_keyboard"
+        android:layout_alignParentTop="true"
+        android:drawingCacheQuality="low"
+        android:fillViewport="true"
+        android:isScrollContainer="true"
+        android:scrollbars="horizontal|vertical">
+
+        <com.freerdp.freerdpcore.presentation.SessionView
+            android:id="@+id/sessionView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:drawingCacheQuality="low"
+            android:focusable="true"
+            android:focusableInTouchMode="true" />
+
+    </com.freerdp.freerdpcore.presentation.ScrollView2D>
+
+    <com.freerdp.freerdpcore.presentation.TouchPointerView
+        android:id="@+id/touchPointerView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:src="@drawable/touch_pointer_default"
+        android:visibility="invisible" />
+
+    <android.widget.ZoomControls
+        android:id="@+id/zoomControls"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBottom="@id/sessionScrollView"
+        android:layout_centerHorizontal="true" />
+
+    <android.inputmethodservice.KeyboardView
+        android:id="@+id/extended_keyboard_header"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:layout_centerHorizontal="true"
+        android:visibility="gone" />
+
+</RelativeLayout>

local-test-freerdp-delta-01/afc-freerdp/client/Android/Studio/freeRDPCore/src/main/res/layout/session_list_item.xml

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+/*
+ Copyright (C) 2007 Google Inc.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+-->
+
+<TwoLineListItem xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content">
+
+    <ImageView
+        android:id="@+id/session_screenshot"
+        android:layout_width="64dp"
+        android:layout_height="48dp"
+        android:layout_alignParentLeft="true"
+        android:layout_centerVertical="true"
+        android:contentDescription="@+id/session_screenshot"
+        android:padding="4dp"
+        android:scaleType="fitXY" />
+
+
+    <TextView
+        android:id="@+id/session_text1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="6dip"
+        android:layout_marginTop="6dip"
+        android:layout_toRightOf="@id/session_screenshot"
+        android:textAppearance="?android:attr/textAppearanceLarge" />
+
+    <TextView
+        android:id="@+id/session_text2"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignLeft="@id/session_text1"
+        android:layout_below="@id/session_text1"
+        android:paddingBottom="4dip"
+        android:textAppearance="?android:attr/textAppearanceSmall" />
+
+    <ImageButton
+        android:id="@+id/session_disconnect"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_centerVertical="true"
+        android:layout_marginRight="7dip"
+        android:layout_marginTop="9dip"
+        android:background="@drawable/button_background"
+        android:contentDescription="@+id/session_disconnect"
+        android:focusable="false"
+        android:focusableInTouchMode="false"
+        android:src="@drawable/icon_button_cancel" />
+
+</TwoLineListItem>

local-test-freerdp-delta-01/afc-freerdp/client/Android/Studio/freeRDPCore/src/main/res/layout/super_bar.xml

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+/*
+   Super bar/Quick connect bar layout
+
+   Copyright 2013 Thincast Technologies GmbH, Author: Martin Fleisz
+
+   This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. 
+   If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
+*/
+ --><!-- Inner layout contains the button and EditText -->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/search_plate"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:descendantFocusability="afterDescendants"
+    android:focusable="true"
+    android:gravity="center_vertical"
+    android:paddingBottom="16dip"
+    android:paddingLeft="12dip"
+    android:paddingRight="6dip"
+    android:paddingTop="7dip">
+
+    <EditText
+        android:id="@+id/superBarEditText"
+        android:layout_width="0dip"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentRight="true"
+        android:drawableLeft="@drawable/icon_edittext_search"
+        android:drawablePadding="2dip"
+        android:drawableRight="@drawable/icon_edittext_clear"
+        android:ellipsize="end"
+        android:hint="@string/search_hint"
+        android:inputType="text"
+        android:paddingLeft="8dip"
+        android:paddingRight="6dip"
+        android:singleLine="true" />
+
+    <Button
+        android:id="@+id/clear_search_btn"
+        android:layout_width="40dip"
+        android:layout_height="40dip"
+        android:layout_alignParentRight="true"
+        android:layout_gravity="right|center_vertical"
+        android:layout_marginRight="10dip"
+        android:background="@android:color/transparent" />
+
+</RelativeLayout>

local-test-freerdp-delta-01/afc-freerdp/client/Android/Studio/freeRDPCore/src/main/res/menu/bookmark_context_menu.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/bookmark_connect"
+        android:showAsAction="ifRoom"
+        android:title="@string/menu_connect" />
+
+    <item
+        android:id="@+id/bookmark_edit"
+        android:showAsAction="ifRoom"
+        android:title="@string/menu_edit" />
+
+    <item
+        android:id="@+id/bookmark_delete"
+        android:showAsAction="ifRoom"
+        android:title="@string/menu_delete" />
+
+</menu>

local-test-freerdp-delta-01/afc-freerdp/client/Android/Studio/freeRDPCore/src/main/res/menu/home_menu.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/newBookmark"
+        android:icon="@drawable/icon_menu_add"
+        android:showAsAction="ifRoom"
+        android:title="@string/menu_new_bookmark" />
+    <item
+        android:id="@+id/appSettings"
+        android:icon="@drawable/icon_menu_settings"
+        android:showAsAction="ifRoom"
+        android:title="@string/menu_app_settings" />
+    <item
+        android:id="@+id/help"
+        android:icon="@drawable/icon_menu_help"
+        android:showAsAction="ifRoom"
+        android:title="@string/menu_help" />
+    <item
+        android:id="@+id/about"
+        android:icon="@drawable/icon_menu_about"
+        android:showAsAction="ifRoom"
+        android:title="@string/menu_about" />
+</menu>

local-test-freerdp-delta-01/afc-freerdp/client/Android/Studio/freeRDPCore/src/main/res/menu/session_menu.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <!--
+    <item android:id="@+id/session_touch_pointer"
+          android:title="@string/pointer"
+          android:icon="@drawable/icon_zoom_in"
+          android:showAsAction="ifRoom"
+    />
+     -->
+    <item
+        android:id="@+id/session_touch_pointer"
+        android:icon="@drawable/icon_menu_touch_pointer"
+        android:showAsAction="ifRoom"
+        android:title="@string/menu_touch_pointer" />
+    <item
+        android:id="@+id/session_sys_keyboard"
+        android:icon="@drawable/icon_menu_sys_keyboard"
+        android:showAsAction="ifRoom"
+        android:title="@string/menu_sys_keyboard" />
+    <item
+        android:id="@+id/session_ext_keyboard"
+        android:icon="@drawable/icon_menu_ext_keyboard"
+        android:showAsAction="ifRoom"
+        android:title="@string/menu_ext_keyboard" />
+    <item
+        android:id="@+id/session_disconnect"
+        android:icon="@drawable/icon_menu_disconnect"
+        android:showAsAction="ifRoom"
+        android:title="@string/menu_disconnect" />
+</menu>

local-test-freerdp-delta-01/afc-freerdp/client/Android/Studio/freeRDPCore/src/main/res/values-de/strings.xml

@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Button labels -->
+    <string name="yes">Ja</string>
+    <string name="no">Nein</string>
+    <string name="cancel">Abbrechen</string>
+    <string name="cont">Fortfahren</string>
+    <string name="login">Login</string>
+    <string name="logout">Logout</string>
+    <!-- Home menu items -->
+    <string name="menu_exit">Beenden</string>
+    <string name="menu_about">Impressum</string>
+    <string name="menu_help">Hilfe</string>
+    <string name="menu_new_bookmark">Neue Verbindung</string>
+    <string name="menu_app_settings">Einstellungen</string>
+    <!-- Bookmark menu items -->
+    <string name="menu_title_bookmark">Verbindung</string>
+    <string name="menu_connect">Verbinden</string>
+    <string name="menu_edit">Bearbeiten</string>
+    <string name="menu_delete">Löschen</string>
+    <!-- Session menu items -->
+    <string name="menu_sys_keyboard">Tastatur</string>
+    <string name="menu_ext_keyboard">Funktionstasten</string>
+    <string name="menu_touch_pointer">Touch Pointer</string>
+    <string name="menu_home">home</string>
+    <string name="menu_disconnect">Verbindung trennen</string>
+    <!-- List section headers -->
+    <string name="section_bookmarks">Manuelle Verbindungen</string>
+    <string name="section_active_sessions">Aktive Sitzungen</string>
+    <!-- Search strings -->
+    <string name="search_hint">Mit Computer verbinden</string>
+    <!-- List placeholder labels -->
+    <string name="list_placeholder_login">Login</string>
+    <string name="list_placeholder_no_servers">Keine Server</string>
+    <string name="list_placeholder_connecting">Verbinde &#8230;</string>
+    <string name="list_placeholder_disconnecting">Trenne Verbundung &#8230;</string>
+    <string name="list_placeholder_connection_error">Verbindung unterbrochen</string>
+    <string name="list_placeholder_wrong_password">Falsches Passwort</string>
+    <string name="list_placeholder_invalid_username">Ungültiger Benutzername</string>
+    <string name="list_placeholder_add_bookmark">Verbindung hinzufügen</string>
+    <!-- Bookmark settings strings -->
+    <string name="settings_cat_host">Host</string>
+    <string name="settings_label">Label</string>
+    <string name="settings_hostname">Host</string>
+    <string name="settings_port">Port</string>
+    <string name="settings_cat_credentials">Zugangsdaten</string>
+    <string name="settings_credentials">Zugangsdaten</string>
+    <string name="settings_username">Benutzername</string>
+    <string name="settings_password">Passwort</string>
+    <string name="settings_domain">Domäne</string>
+    <string name="settings_cat_settings">Einstellungen</string>
+    <string name="settings_screen">Bildschirm</string>
+    <string name="settings_cat_screen">Bildschirm Einstellungen</string>
+    <string name="settings_colors">Farben</string>
+    <string-array name="colors_array">
+        <item>Palette (8 Bit)</item>
+        <item>High Color (15 Bit)</item>
+        <item>High Color (16 Bit)</item>
+        <item>True Color (24 Bit)</item>
+        <item>Highest Quality (32 Bit)</item>
+    </string-array>
+    <string name="settings_resolution">Auflösung</string>
+    <string name="resolution_automatic">automatisch</string>
+    <string name="resolution_fit">an Bildschirm anpassen</string>
+    <string name="resolution_custom">Benutzerdefiniert</string>
+    <string-array name="resolutions_array">
+        <item>automatisch</item>
+        <item>an Bildschirm anpassen</item>
+        <item>Benutzerdefiniert</item>
+        <item>640x480</item>
+        <item>720x480</item>
+        <item>800x600</item>
+        <item>1024x768</item>
+        <item>1280x1024</item>
+        <item>1440x900</item>
+        <item>1920x1080</item>
+        <item>1920x1200</item>
+    </string-array>
+    <string name="settings_width">Breite</string>
+    <string name="settings_height">Höhe</string>
+    <string name="settings_performance">Leistung</string>
+    <string name="settings_cat_performance">Leistungseinstellungen</string>
+    <string name="settings_perf_remotefx">RemoteFX</string>
+    <string name="settings_perf_wallpaper">Desktop Hintergrund</string>
+    <string name="settings_perf_font_smoothing">Kantenglättung</string>
+    <string name="settings_perf_desktop_composition">Desktop Composition</string>
+    <string name="settings_perf_full_window_drag">Zeige Fensterinhalt während</string>
+    <string name="settings_perf_menu_animation">Menü Animation</string>
+    <string name="settings_perf_theming">Visuelle Stile</string>
+    <string name="settings_advanced">Erweitert</string>
+    <string name="settings_cat_advanced">Erweiterte Einstellungen</string>
+    <string name="settings_enable_3g_settings">3G Einstellungen</string>
+    <string name="settings_screen_3g">3G Bildschirm</string>
+    <string name="settings_performance_3g">3G Leistung</string>
+    <string name="settings_cat_gateway">Gateway</string>
+    <string name="settings_enable_gateway_settings">Aktiviere Gateway</string>
+    <string name="settings_gateway_settings">Gateway Einstellungen</string>
+    <string name="settings_redirect_sdcard">SDCard umleiten</string>
+    <string name="settings_redirect_sound">Ton umleiten</string>
+    <string-array name="redirect_sound_array">
+        <item>Nicht abspielen</item>
+        <item>Auf Server abspielen</item>
+        <item>Auf Client abspielen</item>
+    </string-array>
+    <string name="settings_redirect_microphone">Mikrophon umleiten</string>
+    <string name="settings_security">Sicherheit</string>
+    <string-array name="security_array">
+        <item>Automatisch</item>
+        <item>RDP</item>
+        <item>TLS</item>
+        <item>NLA</item>
+    </string-array>
+    <string name="settings_remote_program">Remote Program</string>
+    <string name="settings_work_dir">Arbeitsverzeichnis</string>
+    <string name="settings_async_channel">Async channel</string>
+    <string name="settings_async_update">Async update</string>
+    <string name="settings_console_mode">Konsolenmodus</string>
+    <!-- App settings strings -->
+    <string name="settings_password_present">*******</string>
+    <string name="settings_password_empty">nicht gesetzt</string>
+    <string name="settings_cat_ui">Benutzeroberfläche</string>
+    <string name="settings_ui_hide_status_bar">verstecke Statusleiste</string>
+    <string name="settings_ui_hide_action_bar">Aktionsleiste ausblenden</string>
+    <string name="settings_ui_hide_zoom_controls">verstecke Zoom Tasten</string>
+    <string name="settings_ui_swap_mouse_buttons">Vertausche Maustasten</string>
+    <string name="settings_ui_invert_scrolling">Invertiere Bildlauf</string>
+    <string name="settings_ui_auto_scroll_touchpointer">Touch Zeiger automatischer Bildlauf</string>
+    <string name="settings_ui_ask_on_exit">Zeige Dialog beim Beenden</string>
+    <string name="settings_ui_use_back_as_altf4">Verwenden Sie die "Zurück"-Taste als Alt+F4</string>
+    <string name="settings_cat_power">Energiesparen</string>
+    <string name="settings_power_disconnect_timeout">Schließe ungenutzte Verbindungen</string>
+    <string name="settings_cat_security">Sicherheit</string>
+    <string name="settings_security_accept_certificates">Akzeptiere alle Zertifikate</string>
+    <string name="settings_security_clear_certificate_cache">Lösche Zertifikat Cache</string>
+    <string name="settings_description_after_minutes">Nach %1$d Minuten</string>
+    <string name="settings_description_disabled">Deaktiviert</string>
+    <!-- Activity titles -->
+    <string name="title_bookmark_settings">Verbindungseinstellungen</string>
+    <string name="title_application_settings">Einstellungen</string>
+    <string name="title_home">aFreeRDP - FreeRDP für Android</string>
+    <string name="title_create_shortcut">RDP Verbindungen</string>
+    <string name="title_help">Hilfe</string>
+    <string name="title_about">Impressum</string>
+    <!-- Error message strings -->
+    <string name="error_bookmark_incomplete_title">Verlassen ohne zu speichern?</string>
+    <string name="error_bookmark_incomplete"><i><b>Abbrechen</b></i> um Einstellungen zu verwerfen\n<i><b>Fortfahren</b></i> um weiter zu editieren</string>
+    <string name="error_connection_failure">Konnte keine Verbindung zum Server herstellen!</string>
+    <!-- Info message strings -->
+    <string name="info_capabilities_changed">Die Bildschirmeinstellungen mussten angepasst werden, da der Server die gewählten nicht unterstützt!</string>
+    <string name="info_reset_success">Lösche Zertifikatcache!</string>
+    <string name="info_reset_failed">Konnte Zertifikatcache nicht löschen!</string>
+    <!-- Dialog strings -->
+    <string name="dlg_title_verify_certificate">Prüfe Zertifikat</string>
+    <string name="dlg_msg_verify_certificate">Die Identität des Servers konnte nicht geprüft werden. Trotzdem verbinden?</string>
+    <string name="dlg_title_credentials">Bitte geben sie ihre Zugangsdaten ein:</string>
+    <string name="dlg_title_create_shortcut">Verknüpfung erzeugen</string>
+    <string name="dlg_msg_create_shortcut">Verknüpfungsname:</string>
+    <string name="dlg_msg_connecting">Verbinden &#8230;</string>
+    <string name="dlg_msg_logging_in">Einloggen &#8230;</string>
+    <string name="dlg_title_about">Über aFreeRDP</string>
+    <string name="dlg_title_create_bookmark_after_qc">Verbindungseinstellungen speichern?</string>
+    <string name="dlg_msg_create_bookmark_after_qc">Die Verbindungseinstellungen wurden nicht gespeichert! Jetzt speichern?</string>
+    <string name="dlg_title_save_bookmark">Verbindung speichern?</string>
+    <string name="dlg_save_bookmark">Wollen sie alle Änderungen der Verbindungseinstelleungen speichern?</string>
+    <string name="dlg_dont_show_again">Nicht noch einmal nachfragen</string>
+    <string name="dlg_title_exit">Anwendung beenden?</string>
+    <string name="dlg_msg_exit">Wollen sie die Anwendung wirklich beenden?</string>
+    <string name="dlg_title_clear_cert_cache">Lösche Zertifikate?</string>
+    <string name="dlg_msg_clear_cert_cache">Wollen sie wirklich alle gespeicherten Zertifikate löschen?</string>
+    <string name="debug_level">Debug Stufe</string>
+    <string name="settings_debug">Debug Einstellungen</string>
+    <string name="preference_title_client">Client</string>
+    <string name="preference_title_client_name">Client Name</string>
+    <string name="settings_cat_client">Client</string>
+</resources>

local-test-freerdp-delta-01/afc-freerdp/client/Android/Studio/freeRDPCore/src/main/res/values-fr/strings.xml

@@ -0,0 +1,175 @@
+<resources>
+    <!-- Button labels -->
+    <string name="yes">"Oui"</string>
+    <string name="no">"Non"</string>
+    <string name="cancel">"Annuler"</string>
+    <string name="cont">"Continuer"</string>
+    <string name="login">"Se connecter"</string>
+    <string name="logout">"Déconnexion"</string>
+    <!-- Home menu items -->
+    <string name="menu_exit">"Quitter"</string>
+    <string name="menu_about">"À propos"</string>
+    <string name="menu_help">"Aide"</string>
+    <string name="menu_new_bookmark">"Nouvelle connexion"</string>
+    <string name="menu_app_settings">"Paramètres"</string>
+    <!-- Bookmark menu items -->
+    <string name="menu_title_bookmark">"Connexion"</string>
+    <string name="menu_connect">"Connexion"</string>
+    <string name="menu_edit">"Éditer"</string>
+    <string name="menu_delete">"Supprimer"</string>
+    <!-- Session menu items -->
+    <string name="menu_sys_keyboard">"Clavier"</string>
+    <string name="menu_ext_keyboard">"Touches de fonction"</string>
+    <string name="menu_touch_pointer">"Pointeur tactile"</string>
+    <string name="menu_home">"Accueil"</string>
+    <string name="menu_disconnect">"Se déconnecter"</string>
+    <!-- List section headers -->
+    <string name="section_bookmarks">"Connexions manuelles"</string>
+    <string name="section_active_sessions">"Sessions actives"</string>
+    <!-- Search strings -->
+    <string name="search_hint">"Connexion à l'ordinateur"</string>
+    <!-- List placeholder labels -->
+    <string name="list_placeholder_login">"Se connecter"</string>
+    <string name="list_placeholder_no_servers">"Pas de connexion"</string>
+    <string name="list_placeholder_connecting">"Connexion..."</string>
+    <string name="list_placeholder_disconnecting">"Déconnexion…"</string>
+    <string name="list_placeholder_connection_error">"Perte de la connexion"</string>
+    <string name="list_placeholder_wrong_password">"Mot de passe incorrect"</string>
+    <string name="list_placeholder_invalid_username">"Nom d'utilisateur invalide"</string>
+    <string name="list_placeholder_add_bookmark">"Ajouter une connexion"</string>
+    <!-- Bookmark settings strings -->
+    <string name="settings_cat_host">"Hôte"</string>
+    <string name="settings_label">"Étiquette"</string>
+    <string name="settings_hostname">"Hôte"</string>
+    <string name="settings_port">"Port"</string>
+    <string name="settings_cat_credentials">"Authentifiant"</string>
+    <string name="settings_credentials">"Authentifiant"</string>
+    <string name="settings_username">"Nom d'utilisateur"</string>
+    <string name="settings_password">"Mot de passe"</string>
+    <string name="settings_domain">"Nom de domaine"</string>
+    <string name="settings_cat_settings">"Paramètres"</string>
+    <string name="settings_screen">"Écran"</string>
+    <string name="settings_cat_screen">"Paramètres d'écran"</string>
+    <string name="settings_colors">"Couleurs"</string>
+    <string-array name="colors_array">
+        <item>"Palette (8 bits)"</item>
+        <item>"Hautes couleurs (15 bits)"</item>
+        <item>"Hautes couleurs (16 bits)"</item>
+        <item>"Couleurs vraies (24 bits)"</item>
+        <item>"Haute qualité (32 bits)"</item>
+    </string-array>
+    <string name="settings_resolution">"Résolution"</string>
+    <string name="resolution_automatic">"Automatique"</string>
+    <string name="resolution_fit">"Agrandir la fenêtre"</string>
+    <string name="resolution_custom">"Personalisé"</string>
+    <string-array name="resolutions_array">
+        <item>"Automatique"</item>
+        <item>"Agrandir la fenêtre"</item>
+        <item>"Personalisé"</item>
+        <item>"640x480"</item>
+        <item>"720x480"</item>
+        <item>"800x600"</item>
+        <item>"1024x768"</item>
+        <item>"1280x1024"</item>
+        <item>"1440x900"</item>
+        <item>"1920x1080"</item>
+        <item>"1920x1200"</item>
+    </string-array>
+    <!-- end protected string section -->
+    <string name="settings_width">"Largeur"</string>
+    <string name="settings_height">"Hauteur"</string>
+    <string name="settings_performance">"Performance"</string>
+    <string name="settings_cat_performance">"Paramètres de performance"</string>
+    <string name="settings_perf_remotefx">"RemoteFX"</string>
+    <string name="settings_perf_wallpaper">"Fond d'écran"</string>
+    <string name="settings_perf_font_smoothing">"Lissage des polices"</string>
+    <string name="settings_perf_desktop_composition">"Effets visuels Aero"</string>
+    <string name="settings_perf_full_window_drag">"Afficher le contenu des fenêtres en mouvement"</string>
+    <string name="settings_perf_menu_animation">"Animations de menu"</string>
+    <string name="settings_perf_theming">"Styles visuels"</string>
+    <string name="settings_advanced">"Avancé"</string>
+    <string name="settings_cat_advanced">"Paramètres avancés"</string>
+    <string name="settings_enable_3g_settings">"Paramètres 3G"</string>
+    <string name="settings_screen_3g">"Écran 3G"</string>
+    <string name="settings_performance_3g">"Performance 3G"</string>
+    <string name="settings_cat_gateway">Gateway</string>
+    <string name="settings_enable_gateway_settings">Enable Gateway</string>
+    <string name="settings_gateway_settings">Gateway Settings</string>
+    <string name="settings_redirect_sdcard">"Redirect SDCard"</string>
+    <string name="settings_redirect_sound">Redirect Sound</string>
+    <string-array name="redirect_sound_array">
+        <item>Do not play</item>
+        <item>Play on Server</item>
+        <item>Play on Device</item>
+    </string-array>
+    <string name="settings_redirect_microphone">Redirect Microphone</string>
+    <string name="settings_security">"Securité"</string>
+    <string-array name="security_array">
+        <item>"Automatique"</item>
+        <item>"RDP"</item>
+        <item>"TLS"</item>
+        <item>"NLA"</item>
+    </string-array>
+    <string name="settings_remote_program">"Lancement de programme"</string>
+    <string name="settings_work_dir">"Répertoire de travail"</string>
+    <string name="settings_async_channel">Async channel</string>
+    <string name="settings_async_update">Async update</string>
+    <string name="settings_console_mode">"Mode console"</string>
+    <!-- App settings strings -->
+    <string name="settings_password_present">"*******"</string>
+    <string name="settings_password_empty">"Valeur non définie"</string>
+    <string name="settings_cat_ui">"Interface utilisateur"</string>
+    <string name="settings_ui_hide_status_bar">"Masquer la barre d'état"</string>
+    <string name="settings_ui_hide_action_bar">\"Masquer la barre d\'action\"</string>
+    <string name="settings_ui_hide_zoom_controls">"Masquer les contrôles zoom"</string>
+    <string name="settings_ui_swap_mouse_buttons">"Inverser les boutons de la souris"</string>
+    <string name="settings_ui_invert_scrolling">"Inverser le défilement de la souris"</string>
+    <string name="settings_ui_auto_scroll_touchpointer">"Défilement automatique du pointeur tactile"</string>
+    <string name="settings_ui_ask_on_exit">"Confirmer au moment de quitter"</string>
+    <string name="settings_ui_use_back_as_altf4">Utiliser le bouton "retour" comme Alt+F4</string>
+    <string name="settings_cat_power">"Economie d'énergie"</string>
+    <string name="settings_power_disconnect_timeout">"Fermer les connexions inactives"</string>
+    <string name="settings_cat_security">"Securité"</string>
+    <string name="settings_security_accept_certificates">"Accepter tous les certificats"</string>
+    <string name="settings_security_clear_certificate_cache">"Vider la cache de certificats"</string>
+    <string name="settings_description_after_minutes">"Après %1$d minutes"</string>
+    <string name="settings_description_disabled">"Désactivé"</string>
+    <!-- Activity titles -->
+    <string name="title_bookmark_settings">"Paramètres de connexion"</string>
+    <string name="title_application_settings">"Paramètres"</string>
+    <string name="title_home">"aFreeRDP - FreeRDP pour Android"</string>
+    <string name="title_create_shortcut">"Connexions RDP"</string>
+    <string name="title_help">"Aide"</string>
+    <string name="title_about">"À propos"</string>
+    <!-- Error message strings -->
+    <string name="error_bookmark_incomplete_title">"Annuler sans enregistrer?"</string>
+    <string name="error_bookmark_incomplete">"Appuyez sur \"Annuler\" pour annuler, ou cliquez sur «Continuer» pour spécifier les champs obligatoires."</string>
+    <string name="error_connection_failure">"Impossible d'établir une connexion au serveur!"</string>
+    <!-- Info message strings -->
+    <string name="info_capabilities_changed">"Les paramètres de l'écran ont changé parce que le serveur ne prend pas en charge les paramètres que vous avez spécifiés!"</string>
+    <string name="info_reset_success">"La cache de certificats a été supprimée!"</string>
+    <string name="info_reset_failed">"Impossible de supprimer la cache de certificat!"</string>
+    <!-- Dialog strings -->
+    <string name="dlg_title_verify_certificate">"Validation de certificat"</string>
+    <string name="dlg_msg_verify_certificate">"L'identité de l'ordinateur distant ne peut pas être vérifiée. Voulez-vous poursuivre la connexion?"</string>
+    <string name="dlg_title_credentials">"Veuillez entrer votre nom d'usager et mot de passe"</string>
+    <string name="dlg_title_create_shortcut">"Créer un raccourci"</string>
+    <string name="dlg_msg_create_shortcut">"Nom du raccourci:"</string>
+    <string name="dlg_msg_connecting">"Connexion..."</string>
+    <string name="dlg_msg_logging_in">"Connexion..."</string>
+    <string name="dlg_title_about">"À propos de aFreeRDP"</string>
+    <string name="dlg_title_create_bookmark_after_qc">"Enregistrer les paramètres de connexion?"</string>
+    <string name="dlg_msg_create_bookmark_after_qc">"Vos paramètres de connexion n'ont pas été sauvegardés! Voulez-vous les enregistrer?"</string>
+    <string name="dlg_title_save_bookmark">"Enregistrer la connexion?"</string>
+    <string name="dlg_save_bookmark">"Voulez-vous enregistrer les modifications que vous avez apportées aux paramètres de connexion?"</string>
+    <string name="dlg_dont_show_again">"Ne plus demander"</string>
+    <string name="dlg_title_exit">"Quittez l'application?"</string>
+    <string name="dlg_msg_exit">"Êtes-vous sûr de vouloir quitter l'application?"</string>
+    <string name="dlg_title_clear_cert_cache">"Êtes-vous sûrs de vouloir supprimer les certificats?"</string>
+    <string name="dlg_msg_clear_cert_cache">"Êtes-vous sûr de vouloir supprimer tous les certificats mis en cache?"</string>
+    <string name="debug_level">Debug Level</string>
+    <string name="settings_debug">Debug Settings</string>
+    <string name="preference_title_client">Client</string>
+    <string name="settings_cat_client">Client</string>
+    <string name="preference_title_client_name">Identifiant</string>
+</resources>

local-test-freerdp-delta-01/afc-freerdp/client/Android/Studio/freeRDPCore/src/main/res/values-ja/strings.xml

@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Button labels -->
+    <string name="yes">はい</string>
+    <string name="no">いいえ</string>
+    <string name="cancel">キャンセル</string>
+    <string name="cont">続行</string>
+    <string name="login">ログイン</string>
+    <string name="logout">ログアウト</string>
+    <!-- Home menu items -->
+    <string name="menu_exit">終了</string>
+    <string name="menu_about">aFreeRDPについて</string>
+    <string name="menu_help">ヘルプ</string>
+    <string name="menu_new_bookmark">新しい接続</string>
+    <string name="menu_app_settings">設定</string>
+    <!-- Bookmark menu items -->
+    <string name="menu_title_bookmark">接続</string>
+    <string name="menu_connect">接続する</string>
+    <string name="menu_edit">編集</string>
+    <string name="menu_delete">削除</string>
+    <!-- Session menu items -->
+    <string name="menu_sys_keyboard">キーボード</string>
+    <string name="menu_ext_keyboard">ファンクションキー</string>
+    <string name="menu_touch_pointer">ポインター</string>
+    <string name="menu_home">ホーム</string>
+    <string name="menu_disconnect">切断</string>
+    <!-- List section headers -->
+    <string name="section_bookmarks">手動で接続</string>
+    <string name="section_active_sessions">アクティブなセッション</string>
+    <!-- Search strings -->
+    <string name="search_hint">コンピュータに接続する</string>
+    <!-- List placeholder labels -->
+    <string name="list_placeholder_login">ログイン</string>
+    <string name="list_placeholder_no_servers">サーバーがありません</string>
+    <string name="list_placeholder_connecting">接続中 &#8230;</string>
+    <string name="list_placeholder_disconnecting">切断中 &#8230;</string>
+    <string name="list_placeholder_connection_error">接続できませんでした</string>
+    <string name="list_placeholder_wrong_password">パスワードが違います</string>
+    <string name="list_placeholder_invalid_username">無効なユーザー名です</string>
+    <string name="list_placeholder_add_bookmark">接続を追加</string>
+    <!-- Bookmark settings strings -->
+    <string name="settings_cat_host">ホスト</string>
+    <string name="settings_label">ラベル</string>
+    <string name="settings_hostname">ホスト</string>
+    <string name="settings_port">ポート</string>
+    <string name="settings_cat_credentials">認証情報</string>
+    <string name="settings_credentials">認証情報</string>
+    <string name="settings_username">ユーザー名</string>
+    <string name="settings_password">パスワード</string>
+    <string name="settings_domain">ドメイン</string>
+    <string name="settings_cat_settings">設定</string>
+    <string name="settings_screen">画面</string>
+    <string name="settings_cat_screen">画面設定</string>
+    <string name="settings_colors">色</string>
+    <string-array name="colors_array">
+        <item>Palette (8 Bit)</item>
+        <item>High Color (15 Bit)</item>
+        <item>High Color (16 Bit)</item>
+        <item>True Color (24 Bit)</item>
+        <item>Highest Quality (32 Bit)</item>
+    </string-array>
+    <string name="settings_resolution">解像度</string>
+    <string name="resolution_automatic">自動</string>
+    <string name="resolution_fit">画面に合わせる</string>
+    <string name="resolution_custom">カスタム</string>
+    <string-array name="resolutions_array">
+        <item>自動</item>
+        <item>画面に合わせる</item>
+        <item>カスタム</item>
+        <item>640x480</item>
+        <item>720x480</item>
+        <item>800x600</item>
+        <item>1024x768</item>
+        <item>1280x1024</item>
+        <item>1440x900</item>
+        <item>1920x1080</item>
+        <item>1920x1200</item>
+    </string-array>
+    <string name="settings_width">幅</string>
+    <string name="settings_height">高さ</string>
+    <string name="settings_performance">パフォーマンス</string>
+    <string name="settings_cat_performance">パフォーマンスの設定</string>
+    <string name="settings_perf_remotefx">RemoteFX</string>
+    <string name="settings_perf_wallpaper">デスクトップの背景</string>
+    <string name="settings_perf_font_smoothing">フォントを滑らかにする</string>
+    <string name="settings_perf_desktop_composition">デスクトップの構成</string>
+    <string name="settings_perf_full_window_drag">ドラッグ中のウィンドウ</string>
+    <string name="settings_perf_menu_animation">メニューのアニメーション</string>
+    <string name="settings_perf_theming">視覚設定</string>
+    <string name="settings_advanced">高度な設定</string>
+    <string name="settings_cat_advanced">高度な設定</string>
+    <string name="settings_enable_3g_settings">3G 設定</string>
+    <string name="settings_screen_3g">3G 画面</string>
+    <string name="settings_performance_3g">3G パフォ��マンス</string>
+    <string name="settings_cat_gateway">ゲートウェイ</string>
+    <string name="settings_enable_gateway_settings">ゲートウェイを有効にする</string>
+    <string name="settings_gateway_settings">ゲートウェイの設定</string>
+    <string name="settings_redirect_sdcard">Redirect SDCard</string>
+    <string name="settings_redirect_sound">音声のリダイレクト</string>
+    <string-array name="redirect_sound_array">
+        <item>再生しない</item>
+        <item>サーバー側で再生する</item>
+        <item>デバイス側で再生する</item>
+    </string-array>
+    <string name="settings_redirect_microphone">マイクのリダイレクト</string>
+    <string name="settings_security">セキュリティ</string>
+    <string-array name="security_array">
+        <item>自動</item>
+        <item>RDP</item>
+        <item>TLS</item>
+        <item>NLA</item>
+    </string-array>
+    <!-- This array is used as is in code,
+	do not translate! -->
+    <string name="settings_remote_program">遠隔実行するプログラム</string>
+    <string name="settings_work_dir">作業フォルダ</string>
+    <string name="settings_async_channel">Async channel</string>
+    <string name="settings_async_update">Async update</string>
+    <string name="settings_console_mode">コンソールモード</string>
+    <!-- App settings strings -->
+    <string name="settings_password_present">*******</string>
+    <string name="settings_password_empty">入力されていません</string>
+    <string name="settings_cat_ui">ユーザーインターフェース</string>
+    <string name="settings_ui_hide_status_bar">ステータスバーを隠す</string>
+    <string name="settings_ui_hide_action_bar">アクションバーを隠す</string>
+    <string name="settings_ui_hide_zoom_controls">ズームコントローラーを隠す</string>
+    <string name="settings_ui_swap_mouse_buttons">マウスのボタンを交換する</string>
+    <string name="settings_ui_invert_scrolling">Invert Scrolling</string>
+    <string name="settings_ui_auto_scroll_touchpointer">Touch Pointer Auto Scroll</string>
+    <string name="settings_ui_ask_on_exit">Show Dialog on Exit</string>
+    <string name="settings_ui_use_back_as_altf4">「戻る」ボタンを Alt+F4 として使用する</string>
+    <string name="settings_cat_power">Power Saving</string>
+    <string name="settings_cat_client">Client</string>
+    <string name="settings_power_disconnect_timeout">Close idle Connections</string>
+    <string name="settings_cat_security">Security</string>
+    <string name="settings_security_accept_certificates">Accept all Certificates</string>
+    <string name="settings_security_clear_certificate_cache">Clear Certificate Cache</string>
+    <string name="settings_description_after_minutes">After %1$d Minutes</string>
+    <string name="settings_description_disabled">Disabled</string>
+    <!-- Activity titles -->
+    <string name="title_bookmark_settings">接続設定</string>
+    <string name="title_application_settings">設定</string>
+    <string name="title_home">aFreeRDP - FreeRDP for Android</string>
+    <string name="title_create_shortcut">RDP Connections</string>
+    <string name="title_help">ヘルプ</string>
+    <string name="title_about">aFreeRDPについて</string>
+    <!-- Error message strings -->
+    <string name="error_bookmark_incomplete_title">保存せずに戻りますか?</string>
+    <string name="error_bookmark_incomplete">保存せずに終了する場合は「キャンセル」を押してください。\n続行する場合は「続行」を押して、必要な項目を入力してください。</string>
+    <string name="error_connection_failure">サーバーとの接続を確立できませんでした。</string>
+    <!-- Info message strings -->
+    <string name="info_capabilities_changed">あなたの指定した画面設定はサーバーが対応していないため変更されました。</string>
+    <string name="info_reset_success">認証情報のキャッシュを削除しました。</string>
+    <string name="info_reset_failed">認証情報のキャッシュを削除できませんでした。</string>
+    <!-- Dialog strings -->
+    <string name="dlg_title_verify_certificate">認証情報の検証</string>
+    <string name="dlg_msg_verify_certificate">リモートコンピューターの認証情報が検証できません。接続しますか？</string>
+    <string name="dlg_title_credentials">認証情報を入力してください。</string>
+    <string name="dlg_title_create_shortcut">ショートカットを作成</string>
+    <string name="dlg_msg_create_shortcut">ショートカットの名前:</string>
+    <string name="dlg_msg_connecting">接続中 &#8230;</string>
+    <string name="dlg_msg_logging_in">ログイン中 &#8230;</string>
+    <string name="dlg_title_about">aFreeRDPについて</string>
+    <string name="dlg_title_create_bookmark_after_qc">接続設定を保存しますか？</string>
+    <string name="dlg_msg_create_bookmark_after_qc">接続設定は保存されていません。保存しますか？</string>
+    <string name="dlg_title_save_bookmark">接続設定を保存しますか？</string>
+    <string name="dlg_save_bookmark">接続設定の変更を保存しますか？</string>
+    <string name="dlg_dont_show_again">次回から表示しない</string>
+    <string name="dlg_title_exit">アプリを終了しますか？</string>
+    <string name="dlg_msg_exit">本当にアプリを終了しますか？</string>
+    <string name="dlg_title_clear_cert_cache">認証情報を削除しますか？</string>
+    <string name="dlg_msg_clear_cert_cache">本当にすべてのキャッシュされた認証情報を削除しますか？</string>
+    <string name="debug_level">デバッグレベル</string>
+    <string name="settings_debug">デバッグの設定</string>
+    <string name="preference_title_client">クライアント</string>
+    <string name="preference_title_client_name">クライアントの名前</string>
+</resources>

local-test-freerdp-delta-01/afc-freerdp/client/Android/Studio/freeRDPCore/src/main/res/values-nb-rNO/strings.xml

@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Button labels -->
+    <string name="yes">Ja</string>
+    <string name="no">Nei</string>
+    <string name="cancel">Avbryt</string>
+    <string name="cont">Fortsett</string>
+    <string name="login">Logg inn</string>
+    <string name="logout">Logg ut</string>
+    <!-- Home menu items -->
+    <string name="menu_exit">Avslutt</string>
+    <string name="menu_about">Om</string>
+    <string name="menu_help">Hjelp</string>
+    <string name="menu_new_bookmark">Ny tilkobling</string>
+    <string name="menu_app_settings">Innstilling</string>
+    <!-- Bookmark menu items -->
+    <string name="menu_title_bookmark">Tilkobling</string>
+    <string name="menu_connect">Koble til</string>
+    <string name="menu_edit">Rediger</string>
+    <string name="menu_delete">Slett</string>
+    <!-- Session menu items -->
+    <string name="menu_sys_keyboard">Tastatur</string>
+    <string name="menu_ext_keyboard">Funksjonstaster</string>
+    <string name="menu_touch_pointer">Trykkpeker</string>
+    <string name="menu_home">hjem</string>
+    <string name="menu_disconnect">Koble fra</string>
+    <!-- List section headers -->
+    <string name="section_bookmarks">Manuelle tilkoblinger</string>
+    <string name="section_active_sessions">Pågående økter</string>
+    <!-- Search strings -->
+    <string name="search_hint">Koble til datamaskin</string>
+    <!-- List placeholder labels -->
+    <string name="list_placeholder_login">Logg inn</string>
+    <string name="list_placeholder_no_servers">No Servers</string>
+    <string name="list_placeholder_connecting">Kobler til &#8230;</string>
+    <string name="list_placeholder_disconnecting">Kobler fra &#8230;</string>
+    <string name="list_placeholder_connection_error">Mistet tilknytning</string>
+    <string name="list_placeholder_wrong_password">Feil passord</string>
+    <string name="list_placeholder_invalid_username">Ugyldig brukernavn</string>
+    <string name="list_placeholder_add_bookmark">Ny tilkobling</string>
+    <!-- Bookmark settings strings -->
+    <string name="settings_cat_host">Vert</string>
+    <string name="settings_label">Etikett</string>
+    <string name="settings_hostname">Vertsnavn</string>
+    <string name="settings_port">Port</string>
+    <string name="settings_cat_credentials">Identitetsdetaljer</string>
+    <string name="settings_credentials">Identitetsdetaljer</string>
+    <string name="settings_username">Brukernavn</string>
+    <string name="settings_password">Passord</string>
+    <string name="settings_domain">Domene</string>
+    <string name="settings_cat_settings">Innstillinger</string>
+    <string name="settings_screen">Skjerm</string>
+    <string name="settings_cat_screen">Skjeminnstillinger</string>
+    <string name="settings_colors">Farger</string>
+    <string-array name="colors_array">
+        <item>Palett (8-biters)</item>
+        <item>Høy farge (15-biters)</item>
+        <item>Høy farge (16-biters)</item>
+        <item>Sann farge (24-biters)</item>
+        <item>Høyeste kvalitet (32-biters)</item>
+    </string-array>
+    <string name="settings_resolution">Oppløsning</string>
+    <string name="resolution_automatic">Automatisk</string>
+    <string name="resolution_fit">Tilpass til skjerm</string>
+    <string name="resolution_custom">Tilpasset</string>
+    <string-array name="resolutions_array">
+        <item>Automatic</item>
+        <item>Tilpass til skjerm</item>
+        <item>Egendefinert</item>
+        <item>640x480</item>
+        <item>720x480</item>
+        <item>800x600</item>
+        <item>1024x768</item>
+        <item>1280x1024</item>
+        <item>1440x900</item>
+        <item>1920x1080</item>
+        <item>1920x1200</item>
+    </string-array>
+    <string name="settings_width">Bredde</string>
+    <string name="settings_height">Høyde</string>
+    <string name="settings_performance">Ytelse</string>
+    <string name="settings_cat_performance">Ytelsesinnstillinger</string>
+    <string name="settings_perf_remotefx">RemoteFX</string>
+    <string name="settings_perf_wallpaper">Skrivebordsbakgrunn</string>
+    <string name="settings_perf_font_smoothing">Skriftglatting</string>
+    <string name="settings_perf_desktop_composition">Skrivebordskomposisjon</string>
+    <string name="settings_perf_full_window_drag">Vindusinnhold under dragning</string>
+    <string name="settings_perf_menu_animation">Menyanimasjon</string>
+    <string name="settings_perf_theming">Visuelle stiler</string>
+    <string name="settings_advanced">Advansert</string>
+    <string name="settings_cat_advanced">Avanserte innstillinger</string>
+    <string name="settings_enable_3g_settings">3G-innstillinger</string>
+    <string name="settings_screen_3g">3G-skjerm</string>
+    <string name="settings_performance_3g">3G-ytelse</string>
+    <string name="settings_cat_gateway">Portner</string>
+    <string name="settings_enable_gateway_settings">Skru på portner</string>
+    <string name="settings_gateway_settings">Portner-innstilinger</string>
+    <string name="settings_redirect_sdcard">Videresend SD-kort</string>
+    <string name="settings_redirect_sound">Videresend lyd</string>
+    <string-array name="redirect_sound_array">
+        <item>Ikke spill</item>
+        <item>Spill på tjener</item>
+        <item>Spill på enhet</item>
+    </string-array>
+    <string name="settings_redirect_microphone">Videresend mikrofon</string>
+    <string name="settings_security">Sikkerhet</string>
+    <string-array name="security_array">
+        <item>Automatisk</item>
+        <item>RDP</item>
+        <item>TLS</item>
+        <item>NLA</item>
+    </string-array>
+    <string name="settings_remote_program">Fjernprogram</string>
+    <string name="settings_work_dir">Arbeidsmappe</string>
+    <string name="settings_async_channel">Asynk-kanal</string>
+    <string name="settings_async_update">Asynk-oppdatering</string>
+    <string name="settings_console_mode">Konsollmodus</string>
+    <!-- App settings strings -->
+    <string name="settings_password_present">*******</string>
+    <string name="settings_password_empty">ikke satt</string>
+    <string name="settings_cat_ui">Brukergrensesnitt</string>
+    <string name="settings_ui_hide_status_bar">Skjul statusfelt</string>
+    <string name="settings_ui_hide_action_bar">Skjul handlingsfelt</string>
+    <string name="settings_ui_hide_zoom_controls">Skjul forstørrelseskontroller</string>
+    <string name="settings_ui_swap_mouse_buttons">Bytt museknapper</string>
+    <string name="settings_ui_invert_scrolling">Inverter rulling</string>
+    <string name="settings_ui_auto_scroll_touchpointer">Autorulling for trykkpeker</string>
+    <string name="settings_ui_ask_on_exit">Vis dialogvindu ved avslutning</string>
+    <string name="settings_ui_use_back_as_altf4">Bruk "tilbake"-knappen som Alt+F4</string>
+    <string name="settings_cat_power">Strømsparing</string>
+    <string name="settings_cat_client">Klient</string>
+    <string name="settings_power_disconnect_timeout">Lukk tilkoblinger ved lediggang</string>
+    <string name="settings_cat_security">Sikkerhet</string>
+    <string name="settings_security_accept_certificates">Godta alle sertifikater</string>
+    <string name="settings_security_clear_certificate_cache">Tøm sertifikatshurtiglager</string>
+    <string name="settings_description_after_minutes">Etter %1$d minutt</string>
+    <string name="settings_description_disabled">Avskrudd</string>
+    <!-- Activity titles -->
+    <string name="title_bookmark_settings">Tilkoblingsinnstillinger</string>
+    <string name="title_application_settings">Innstillinger</string>
+    <string name="title_home">aFreeRDP - FreeRDP for Android</string>
+    <string name="title_create_shortcut">RDP-tilkoblinger</string>
+    <string name="title_help">Hjelp</string>
+    <string name="title_about">Om</string>
+    <!-- Error message strings -->
+    <string name="error_bookmark_incomplete_title">Avbryt uten å lagre?</string>
+    <string name="error_bookmark_incomplete">Trykk "Avbryt" for å annullere!\nTrykk "Fortsett" for å angi påkrevde felter!</string>
+    <string name="error_connection_failure">Klarte ikke å etablere tilknytning til tjeneren!</string>
+    <!-- Info message strings -->
+    <string name="info_capabilities_changed">Skjerminnstillingene har blitt endret til noe tjeneren støtter istedenfor.</string>
+    <string name="info_reset_success">Slettet sertifikatshurtiglageret.</string>
+    <string name="info_reset_failed">Klarte ikke å slette sertifikatshurtigageret!</string>
+    <!-- Dialog strings -->
+    <string name="dlg_title_verify_certificate">Bekreft sertifikat</string>
+    <string name="dlg_msg_verify_certificate">Identiteten til datamaskinen annensteds hen kan ikke bekreftes. Ønsker du å koble til likevel?</string>
+    <string name="dlg_title_credentials">Skriv inn dine identitetsdetaljer</string>
+    <string name="dlg_title_create_shortcut">Opprett snarvei</string>
+    <string name="dlg_msg_create_shortcut">Snarveisnavn:</string>
+    <string name="dlg_msg_connecting">Kobler til &#8230;</string>
+    <string name="dlg_msg_logging_in">Logger inn &#8230;</string>
+    <string name="dlg_title_about">Om aFreeRDP</string>
+    <string name="dlg_title_create_bookmark_after_qc">Lagre tilkoblingsinnstillinger?</string>
+    <string name="dlg_msg_create_bookmark_after_qc">Ønsker du å lagre de ulagrede tilkoblingsinnstillingene?</string>
+    <string name="dlg_title_save_bookmark">Lagre tilkobling?</string>
+    <string name="dlg_save_bookmark">Ønsker du å lagre endringer gjort i tilkoblingsinnstillingene?</string>
+    <string name="dlg_dont_show_again">Ikke spør igjen</string>
+    <string name="dlg_title_exit">Avslutt program?</string>
+    <string name="dlg_msg_exit">Er du sikker på at du vil avslutte programmet?</string>
+    <string name="dlg_title_clear_cert_cache">Slett sertifikater?</string>
+    <string name="dlg_msg_clear_cert_cache">Er du sikker på at du vil slette alle sertifikater i hurtiglager?</string>
+    <string name="debug_level">Feilsøkingsnivå</string>
+    <string name="settings_debug">Avlusingsinnstillinger</string>
+    <string name="preference_title_client">Klient</string>
+    <string name="preference_title_client_name">Klientnavn</string>
+</resources>

local-test-freerdp-delta-01/afc-freerdp/client/Android/Studio/freeRDPCore/src/main/res/values-w820dp/dimens.xml

@@ -0,0 +1,6 @@
+<resources>
+    <!-- Example customization of dimensions originally defined in res/values/dimens.xml
+         (such as screen margins) for screens with more than 820dp of available width. This
+         would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
+    <dimen name="activity_horizontal_margin">64dp</dimen>
+</resources>

local-test-freerdp-delta-01/afc-freerdp/client/Android/Studio/freeRDPCore/src/main/res/values-zh-rTW/strings.xml

@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Button labels -->
+    <string name="yes">是</string>
+    <string name="no">否</string>
+    <string name="cancel">取消</string>
+    <string name="cont">繼續</string>
+    <string name="login">登入</string>
+    <string name="logout">登出</string>
+    <!-- Home menu items -->
+    <string name="menu_exit">結束</string>
+    <string name="menu_about">關於</string>
+    <string name="menu_help">說明</string>
+    <string name="menu_new_bookmark">新連線</string>
+    <string name="menu_app_settings">設定</string>
+    <!-- Bookmark menu items -->
+    <string name="menu_title_bookmark">連線</string>
+    <string name="menu_connect">連線</string>
+    <string name="menu_edit">編輯</string>
+    <string name="menu_delete">刪除</string>
+    <!-- Session menu items -->
+    <string name="menu_sys_keyboard">鍵盤</string>
+    <string name="menu_ext_keyboard">功能鍵</string>
+    <string name="menu_touch_pointer">觸控指標</string>
+    <string name="menu_home">首頁</string>
+    <string name="menu_disconnect">中斷連線</string>
+    <!-- List section headers -->
+    <string name="section_bookmarks">手動連線</string>
+    <string name="section_active_sessions">使用中的連線</string>
+    <!-- Search strings -->
+    <string name="search_hint">連線到電腦</string>
+    <!-- List placeholder labels -->
+    <string name="list_placeholder_login">登入</string>
+    <string name="list_placeholder_no_servers">無遠端電腦</string>
+    <string name="list_placeholder_connecting">連線中 &#8230;</string>
+    <string name="list_placeholder_disconnecting">正在中斷連線 &#8230;</string>
+    <string name="list_placeholder_connection_error">連線失敗</string>
+    <string name="list_placeholder_wrong_password">密碼錯誤</string>
+    <string name="list_placeholder_invalid_username">無效的使用者名稱</string>
+    <string name="list_placeholder_add_bookmark">新增連線</string>
+    <!-- Bookmark settings strings -->
+    <string name="settings_cat_host">主機</string>
+    <string name="settings_label">標籤</string>
+    <string name="settings_hostname">主機名稱</string>
+    <string name="settings_port">連接埠</string>
+    <string name="settings_cat_credentials">登入資訊</string>
+    <string name="settings_credentials">登入資訊</string>
+    <string name="settings_username">使用者名稱</string>
+    <string name="settings_password">密碼</string>
+    <string name="settings_domain">網域</string>
+    <string name="settings_cat_settings">設定</string>
+    <string name="settings_screen">螢幕</string>
+    <string name="settings_cat_screen">螢幕設定</string>
+    <string name="settings_colors">顏色</string>
+    <string-array name="colors_array">
+        <item>256 色（8 位元）</item>
+        <item>高彩（15 位元）</item>
+        <item>高彩（16 位元）</item>
+        <item>全彩（24 位元）</item>
+        <item>最高品質（32 位元）</item>
+    </string-array>
+    <string name="settings_resolution">解析度</string>
+    <string name="resolution_automatic">自動</string>
+    <string name="resolution_fit">符合螢幕</string>
+    <string name="resolution_custom">自訂</string>
+    <string-array name="resolutions_array">
+        <item>自動</item>
+        <item>符合螢幕</item>
+        <item>自訂</item>
+        <item>640x480</item>
+        <item>720x480</item>
+        <item>800x600</item>
+        <item>1024x768</item>
+        <item>1280x1024</item>
+        <item>1440x900</item>
+        <item>1920x1080</item>
+        <item>1920x1200</item>
+    </string-array>
+    <string name="settings_width">寬</string>
+    <string name="settings_height">高</string>
+    <string name="settings_performance">效能</string>
+    <string name="settings_cat_performance">效能設定</string>
+    <string name="settings_perf_remotefx">RemoteFX</string>
+    <string name="settings_perf_wallpaper">桌面背景</string>
+    <string name="settings_perf_font_smoothing">字形平滑處理</string>
+    <string name="settings_perf_desktop_composition">桌面轉譯緩衝處理</string>
+    <string name="settings_perf_full_window_drag">拖曳時顯示視窗內容</string>
+    <string name="settings_perf_menu_animation">功能表及視窗動畫</string>
+    <string name="settings_perf_theming">視覺樣式</string>
+    <string name="settings_advanced">進階</string>
+    <string name="settings_cat_advanced">進階設定</string>
+    <string name="settings_enable_3g_settings">3G 設定</string>
+    <string name="settings_screen_3g">3G 螢幕</string>
+    <string name="settings_performance_3g">3G 效能</string>
+    <string name="settings_cat_gateway">閘道</string>
+    <string name="settings_enable_gateway_settings">啟用閘道伺服器</string>
+    <string name="settings_gateway_settings">閘道設定</string>
+    <string name="settings_redirect_sdcard">遠端 SD 卡</string>
+    <string name="settings_redirect_sound">遠端音訊</string>
+    <string-array name="redirect_sound_array">
+        <item>不要播放</item>
+        <item>在遠端電腦上播放</item>
+        <item>在這部裝置上播放</item>
+    </string-array>
+    <string name="settings_redirect_microphone">遠端麥克風</string>
+    <string name="settings_security">安全性</string>
+    <string-array name="security_array">
+        <item>自動</item>
+        <item>RDP</item>
+        <item>TLS</item>
+        <item>NLA</item>
+    </string-array>
+    <string name="settings_remote_program">遠端程式</string>
+    <string name="settings_work_dir">工作目錄</string>
+    <string name="settings_async_channel">非同步通道</string>
+    <string name="settings_async_update">非同步更新</string>
+    <string name="settings_console_mode">主控台模式</string>
+    <!-- App settings strings -->
+    <string name="settings_password_present">*******</string>
+    <string name="settings_password_empty">未設定密碼</string>
+    <string name="settings_cat_ui">使用者介面</string>
+    <string name="settings_ui_hide_status_bar">隱藏狀態列</string>
+    <string name="settings_ui_hide_action_bar">隱藏動作列</string>
+    <string name="settings_ui_hide_zoom_controls">隱藏縮放控制</string>
+    <string name="settings_ui_swap_mouse_buttons">滑鼠按鈕互換</string>
+    <string name="settings_ui_invert_scrolling">反向滾動</string>
+    <string name="settings_ui_auto_scroll_touchpointer">觸控指標自動滾動</string>
+    <string name="settings_ui_ask_on_exit">結束時顯示對話框</string>
+    <string name="settings_ui_use_back_as_altf4">將『返回』按鈕設為 Alt+F4 快捷鍵</string>
+    <string name="settings_cat_power">省電</string>
+    <string name="settings_cat_client">用戶端</string>
+    <string name="settings_power_disconnect_timeout">關閉閒置連線</string>
+    <string name="settings_cat_security">安全性</string>
+    <string name="settings_security_accept_certificates">接受所有憑證</string>
+    <string name="settings_security_clear_certificate_cache">清除憑證快取</string>
+    <string name="settings_description_after_minutes">在 %1$d 分鐘後</string>
+    <string name="settings_description_disabled">已停用</string>
+    <!-- Activity titles -->
+    <string name="title_bookmark_settings">連線設定</string>
+    <string name="title_application_settings">設定</string>
+    <string name="title_home">aFreeRDP - Android 的 FreeRDP</string>
+    <string name="title_create_shortcut">RDP 連線</string>
+    <string name="title_help">說明</string>
+    <string name="title_about">關於</string>
+    <!-- Error message strings -->
+    <string name="error_bookmark_incomplete_title">是否取消而不儲存？</string>
+    <string name="error_bookmark_incomplete">按「取消」以中止！\n按「繼續」以指定必要的欄位！</string>
+    <string name="error_connection_failure">無法建立與遠端電腦的連線！</string>
+    <!-- Info message strings -->
+    <string name="info_capabilities_changed">螢幕設定已更改為遠端電腦支援的設定。</string>
+    <string name="info_reset_success">憑證快取已刪除。</string>
+    <string name="info_reset_failed">無法刪除憑證快取！</string>
+    <!-- Dialog strings -->
+    <string name="dlg_title_verify_certificate">驗證憑證</string>
+    <string name="dlg_msg_verify_certificate">無法驗證遠端電腦的身份。您要繼續連線嗎？</string>
+    <string name="dlg_title_credentials">請輸入您的登入資訊</string>
+    <string name="dlg_title_create_shortcut">建立捷徑</string>
+    <string name="dlg_msg_create_shortcut">捷徑名稱：</string>
+    <string name="dlg_msg_connecting">連線中 &#8230;</string>
+    <string name="dlg_msg_logging_in">登入中 &#8230;</string>
+    <string name="dlg_title_about">關於 aFreeRDP</string>
+    <string name="dlg_title_create_bookmark_after_qc">儲存連線設定？</string>
+    <string name="dlg_msg_create_bookmark_after_qc">您要儲存未儲存的連線設定嗎？</string>
+    <string name="dlg_title_save_bookmark">儲存連線？</string>
+    <string name="dlg_save_bookmark">您要儲存對連線設定所做的任何更改嗎？</string>
+    <string name="dlg_dont_show_again">不再詢問</string>
+    <string name="dlg_title_exit">結束應用程式？</string>
+    <string name="dlg_msg_exit">您確定要結束應用程式嗎？</string>
+    <string name="dlg_title_clear_cert_cache">刪除憑證？</string>
+    <string name="dlg_msg_clear_cert_cache">您確定要刪除所有快取的憑證嗎？</string>
+    <string name="debug_level">偵錯等級</string>
+    <string name="settings_debug">偵錯設定</string>
+    <string name="preference_title_client">用戶端</string>
+    <string name="preference_title_client_name">用戶端名稱</string>
+</resources>

local-test-freerdp-delta-01/afc-freerdp/client/Android/Studio/freeRDPCore/src/main/res/xml/debug_settings.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+/*
+	Debug Settings Layout
+
+	Copyright 2013 Thincast Technologies GmbH
+	Copyright 2013 Armin Novak <[email protected]>
+	
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+	
+		http://www.apache.org/licenses/LICENSE-2.0
+	
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+*/
+ -->
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <PreferenceCategory android:title="@string/settings_debug">
+        <ListPreference
+            android:entries="@array/debug_array"
+            android:entryValues="@array/debug_values_array"
+            android:key="bookmark.debug_level"
+            android:title="@string/debug_level" />
+        <CheckBoxPreference
+            android:key="bookmark.async_channel"
+            android:title="@string/settings_async_channel" />
+        <CheckBoxPreference
+            android:key="bookmark.async_update"
+            android:title="@string/settings_async_update" />
+    </PreferenceCategory>
+</PreferenceScreen>

local-test-freerdp-delta-01/afc-freerdp/client/Android/Studio/freeRDPCore/src/main/res/xml/numpad_keyboard.xml

@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+/*
+   Numpad keyboard layout
+
+   Copyright 2013 Thincast Technologies GmbH, Author: Martin Fleisz
+
+   This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. 
+   If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
+*/
+ --><!--
+
+  Numpad Keyboard layout
+  
+  Button Arrangement 
+  
+  (   )   7   8   9   -     
+  /   *   4   5   6   +
+  Fn  Num 1   2   3   BackSp
+  Cur =   0       .   Enter
+    
+-->
+
+<Keyboard xmlns:android="http://schemas.android.com/apk/res/android"
+    android:horizontalGap="0px"
+    android:keyHeight="@dimen/key_height"
+    android:keyWidth="16.6%p"
+    android:verticalGap="0px">
+
+    <Row>
+        <Key
+            android:codes="@integer/keycode_numpad_left_paren"
+            android:keyEdgeFlags="left"
+            android:keyLabel="(" />
+        <Key
+            android:codes="@integer/keycode_numpad_right_paren"
+            android:keyLabel=")" />
+        <Key
+            android:codes="@integer/keycode_numpad_7"
+            android:keyLabel="7" />
+        <Key
+            android:codes="@integer/keycode_numpad_8"
+            android:keyLabel="8" />
+        <Key
+            android:codes="@integer/keycode_numpad_9"
+            android:keyLabel="9" />
+        <Key
+            android:codes="@integer/keycode_numpad_subtract"
+            android:keyLabel="-" />
+    </Row>
+
+    <Row>
+        <Key
+            android:codes="@integer/keycode_numpad_divide"
+            android:keyEdgeFlags="left"
+            android:keyLabel="/" />
+        <Key
+            android:codes="@integer/keycode_numpad_multiply"
+            android:keyLabel="*" />
+        <Key
+            android:codes="@integer/keycode_numpad_4"
+            android:keyLabel="4" />
+        <Key
+            android:codes="@integer/keycode_numpad_5"
+            android:keyLabel="5" />
+        <Key
+            android:codes="@integer/keycode_numpad_6"
+            android:keyLabel="6" />
+        <Key
+            android:codes="@integer/keycode_numpad_add"
+            android:keyEdgeFlags="right"
+            android:keyLabel="+" />
+    </Row>
+
+    <Row>
+        <Key
+            android:codes="@integer/keycode_specialkeys_keyboard"
+            android:keyEdgeFlags="left"
+            android:keyLabel="Fn" />
+        <Key
+            android:codes="@integer/keycode_numpad_numlock"
+            android:keyLabel="Num" />
+        <Key
+            android:codes="@integer/keycode_numpad_1"
+            android:keyLabel="1" />
+        <Key
+            android:codes="@integer/keycode_numpad_2"
+            android:keyLabel="2" />
+        <Key
+            android:codes="@integer/keycode_numpad_3"
+            android:keyLabel="3" />
+        <Key
+            android:codes="@integer/keycode_backspace"
+            android:keyEdgeFlags="right"
+            android:keyIcon="@drawable/sym_keyboard_delete" />
+    </Row>
+
+    <Row android:rowEdgeFlags="bottom">
+        <Key
+            android:codes="@integer/keycode_cursor_keyboard"
+            android:iconPreview="@drawable/sym_keyboard_arrows_black"
+            android:keyEdgeFlags="left"
+            android:keyIcon="@drawable/sym_keyboard_arrows" />
+        <Key
+            android:codes="@integer/keycode_numpad_equals"
+            android:keyLabel="=" />
+        <Key
+            android:codes="@integer/keycode_numpad_0"
+            android:keyLabel="0"
+            android:keyWidth="33.3%p" />
+        <Key
+            android:codes="@integer/keycode_numpad_comma"
+            android:keyLabel="." />
+        <Key
+            android:codes="@integer/keycode_numpad_enter"
+            android:keyEdgeFlags="right"
+            android:keyIcon="@drawable/sym_keyboard_return" />
+    </Row>
+</Keyboard>
+    

local-test-freerdp-delta-01/afc-freerdp/libfreerdp/codec/zgfx.c

@@ -0,0 +1,644 @@
+/**
+ * FreeRDP: A Remote Desktop Protocol Implementation
+ * ZGFX (RDP8) Bulk Data Compression
+ *
+ * Copyright 2014 Marc-Andre Moreau <[email protected]>
+ * Copyright 2017 Armin Novak <[email protected]>
+ * Copyright 2017 Thincast Technologies GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <freerdp/config.h>
+
+#include <winpr/assert.h>
+#include <winpr/cast.h>
+#include <winpr/crt.h>
+#include <winpr/print.h>
+#include <winpr/bitstream.h>
+
+#include <freerdp/log.h>
+#include <freerdp/codec/zgfx.h>
+
+#define TAG FREERDP_TAG("codec")
+
+/**
+ * RDP8 Compressor Limits:
+ *
+ * Maximum number of uncompressed bytes in a single segment: 65535
+ * Maximum match distance / minimum history size: 2500000 bytes.
+ * Maximum number of segments: 65535
+ * Maximum expansion of a segment (when compressed size exceeds uncompressed): 1000 bytes
+ * Minimum match length: 3 bytes
+ */
+
+typedef struct
+{
+	UINT32 prefixLength;
+	UINT32 prefixCode;
+	UINT32 valueBits;
+	UINT32 tokenType;
+	UINT32 valueBase;
+} ZGFX_TOKEN;
+
+struct S_ZGFX_CONTEXT
+{
+	BOOL Compressor;
+
+	const BYTE* pbInputCurrent;
+	const BYTE* pbInputEnd;
+
+	UINT32 bits;
+	UINT32 cBitsRemaining;
+	UINT32 BitsCurrent;
+	UINT32 cBitsCurrent;
+
+	BYTE OutputBuffer[65536];
+	UINT32 OutputCount;
+
+	BYTE HistoryBuffer[2500000];
+	UINT32 HistoryIndex;
+	UINT32 HistoryBufferSize;
+};
+
+static const ZGFX_TOKEN ZGFX_TOKEN_TABLE[] = {
+	// len code vbits type  vbase
+	{ 1, 0, 8, 0, 0 },           // 0
+	{ 5, 17, 5, 1, 0 },          // 10001
+	{ 5, 18, 7, 1, 32 },         // 10010
+	{ 5, 19, 9, 1, 160 },        // 10011
+	{ 5, 20, 10, 1, 672 },       // 10100
+	{ 5, 21, 12, 1, 1696 },      // 10101
+	{ 5, 24, 0, 0, 0x00 },       // 11000
+	{ 5, 25, 0, 0, 0x01 },       // 11001
+	{ 6, 44, 14, 1, 5792 },      // 101100
+	{ 6, 45, 15, 1, 22176 },     // 101101
+	{ 6, 52, 0, 0, 0x02 },       // 110100
+	{ 6, 53, 0, 0, 0x03 },       // 110101
+	{ 6, 54, 0, 0, 0xFF },       // 110110
+	{ 7, 92, 18, 1, 54944 },     // 1011100
+	{ 7, 93, 20, 1, 317088 },    // 1011101
+	{ 7, 110, 0, 0, 0x04 },      // 1101110
+	{ 7, 111, 0, 0, 0x05 },      // 1101111
+	{ 7, 112, 0, 0, 0x06 },      // 1110000
+	{ 7, 113, 0, 0, 0x07 },      // 1110001
+	{ 7, 114, 0, 0, 0x08 },      // 1110010
+	{ 7, 115, 0, 0, 0x09 },      // 1110011
+	{ 7, 116, 0, 0, 0x0A },      // 1110100
+	{ 7, 117, 0, 0, 0x0B },      // 1110101
+	{ 7, 118, 0, 0, 0x3A },      // 1110110
+	{ 7, 119, 0, 0, 0x3B },      // 1110111
+	{ 7, 120, 0, 0, 0x3C },      // 1111000
+	{ 7, 121, 0, 0, 0x3D },      // 1111001
+	{ 7, 122, 0, 0, 0x3E },      // 1111010
+	{ 7, 123, 0, 0, 0x3F },      // 1111011
+	{ 7, 124, 0, 0, 0x40 },      // 1111100
+	{ 7, 125, 0, 0, 0x80 },      // 1111101
+	{ 8, 188, 20, 1, 1365664 },  // 10111100
+	{ 8, 189, 21, 1, 2414240 },  // 10111101
+	{ 8, 252, 0, 0, 0x0C },      // 11111100
+	{ 8, 253, 0, 0, 0x38 },      // 11111101
+	{ 8, 254, 0, 0, 0x39 },      // 11111110
+	{ 8, 255, 0, 0, 0x66 },      // 11111111
+	{ 9, 380, 22, 1, 4511392 },  // 101111100
+	{ 9, 381, 23, 1, 8705696 },  // 101111101
+	{ 9, 382, 24, 1, 17094304 }, // 101111110
+	{ 0 }
+};
+
+static INLINE BOOL zgfx_GetBits(ZGFX_CONTEXT* WINPR_RESTRICT zgfx, UINT32 nbits)
+{
+	if (!zgfx)
+		return FALSE;
+
+	while (zgfx->cBitsCurrent < nbits)
+	{
+		zgfx->BitsCurrent <<= 8;
+
+		if (zgfx->pbInputCurrent < zgfx->pbInputEnd)
+			zgfx->BitsCurrent += *(zgfx->pbInputCurrent)++;
+
+		zgfx->cBitsCurrent += 8;
+	}
+
+	zgfx->cBitsRemaining -= nbits;
+	zgfx->cBitsCurrent -= nbits;
+	zgfx->bits = zgfx->BitsCurrent >> zgfx->cBitsCurrent;
+	zgfx->BitsCurrent &= ((1 << zgfx->cBitsCurrent) - 1);
+	return TRUE;
+}
+
+static INLINE void zgfx_history_buffer_ring_write(ZGFX_CONTEXT* WINPR_RESTRICT zgfx,
+                                                  const BYTE* WINPR_RESTRICT src, size_t count)
+{
+	if (count <= 0)
+		return;
+
+	if (count > zgfx->HistoryBufferSize)
+	{
+		const size_t residue = count - zgfx->HistoryBufferSize;
+		count = zgfx->HistoryBufferSize;
+		src += residue;
+		zgfx->HistoryIndex = (zgfx->HistoryIndex + residue) % zgfx->HistoryBufferSize;
+	}
+
+	if (zgfx->HistoryIndex + count <= zgfx->HistoryBufferSize)
+	{
+		CopyMemory(&(zgfx->HistoryBuffer[zgfx->HistoryIndex]), src, count);
+
+		if ((zgfx->HistoryIndex += count) == zgfx->HistoryBufferSize)
+			zgfx->HistoryIndex = 0;
+	}
+	else
+	{
+		const UINT32 front = zgfx->HistoryBufferSize - zgfx->HistoryIndex;
+		CopyMemory(&(zgfx->HistoryBuffer[zgfx->HistoryIndex]), src, front);
+		CopyMemory(zgfx->HistoryBuffer, &src[front], count - front);
+		zgfx->HistoryIndex = (UINT32)(count - front);
+	}
+}
+
+static INLINE void zgfx_history_buffer_ring_read(ZGFX_CONTEXT* WINPR_RESTRICT zgfx, int offset,
+                                                 BYTE* WINPR_RESTRICT dst, UINT32 count)
+{
+	UINT32 front = 0;
+	UINT32 index = 0;
+	INT32 bytes = 0;
+	UINT32 valid = 0;
+	INT32 bytesLeft = 0;
+	BYTE* dptr = dst;
+	BYTE* origDst = dst;
+
+	if ((count <= 0) || (count > INT32_MAX))
+		return;
+
+	bytesLeft = (INT32)count;
+	index = (zgfx->HistoryIndex + zgfx->HistoryBufferSize -
+	         WINPR_ASSERTING_INT_CAST(uint32_t, offset)) %
+	        zgfx->HistoryBufferSize;
+	bytes = MIN(bytesLeft, offset);
+
+	if ((index + WINPR_ASSERTING_INT_CAST(uint32_t, bytes)) <= zgfx->HistoryBufferSize)
+	{
+		CopyMemory(dptr, &(zgfx->HistoryBuffer[index]), WINPR_ASSERTING_INT_CAST(size_t, bytes));
+	}
+	else
+	{
+		front = zgfx->HistoryBufferSize - index;
+		CopyMemory(dptr, &(zgfx->HistoryBuffer[index]), front);
+		CopyMemory(&dptr[front], zgfx->HistoryBuffer,
+		           WINPR_ASSERTING_INT_CAST(uint32_t, bytes) - front);
+	}
+
+	if ((bytesLeft -= bytes) == 0)
+		return;
+
+	dptr += bytes;
+	valid = WINPR_ASSERTING_INT_CAST(uint32_t, bytes);
+
+	do
+	{
+		bytes = WINPR_ASSERTING_INT_CAST(int32_t, valid);
+
+		if (bytes > bytesLeft)
+			bytes = bytesLeft;
+
+		CopyMemory(dptr, origDst, WINPR_ASSERTING_INT_CAST(size_t, bytes));
+		dptr += bytes;
+		valid <<= 1;
+	} while ((bytesLeft -= bytes) > 0);
+}
+
+static INLINE BOOL zgfx_decompress_segment(ZGFX_CONTEXT* WINPR_RESTRICT zgfx,
+                                           wStream* WINPR_RESTRICT stream, size_t segmentSize)
+{
+	BYTE c = 0;
+	BYTE flags = 0;
+	UINT32 extra = 0;
+	int opIndex = 0;
+	UINT32 haveBits = 0;
+	UINT32 inPrefix = 0;
+	UINT32 count = 0;
+	UINT32 distance = 0;
+	BYTE* pbSegment = NULL;
+
+	WINPR_ASSERT(zgfx);
+	WINPR_ASSERT(stream);
+
+	if (segmentSize < 2)
+		return FALSE;
+
+	const size_t cbSegment = segmentSize - 1;
+
+	if (!Stream_CheckAndLogRequiredLength(TAG, stream, segmentSize) || (segmentSize > UINT32_MAX))
+		return FALSE;
+
+	Stream_Read_UINT8(stream, flags); /* header (1 byte) */
+	zgfx->OutputCount = 0;
+	pbSegment = Stream_Pointer(stream);
+	if (!Stream_SafeSeek(stream, cbSegment))
+		return FALSE;
+
+	if (!(flags & PACKET_COMPRESSED))
+	{
+		zgfx_history_buffer_ring_write(zgfx, pbSegment, cbSegment);
+
+		if (cbSegment > sizeof(zgfx->OutputBuffer))
+			return FALSE;
+
+		CopyMemory(zgfx->OutputBuffer, pbSegment, cbSegment);
+		zgfx->OutputCount = (UINT32)cbSegment;
+		return TRUE;
+	}
+
+	zgfx->pbInputCurrent = pbSegment;
+	zgfx->pbInputEnd = &pbSegment[cbSegment - 1];
+	/* NumberOfBitsToDecode = ((NumberOfBytesToDecode - 1) * 8) - ValueOfLastByte */
+	const size_t bits = 8u * (cbSegment - 1u);
+	if (bits > UINT32_MAX)
+		return FALSE;
+	if (bits < *zgfx->pbInputEnd)
+		return FALSE;
+
+	zgfx->cBitsRemaining = (UINT32)(bits - *zgfx->pbInputEnd);
+	zgfx->cBitsCurrent = 0;
+	zgfx->BitsCurrent = 0;
+
+	while (zgfx->cBitsRemaining)
+	{
+		haveBits = 0;
+		inPrefix = 0;
+
+		for (opIndex = 0; ZGFX_TOKEN_TABLE[opIndex].prefixLength != 0; opIndex++)
+		{
+			while (haveBits < ZGFX_TOKEN_TABLE[opIndex].prefixLength)
+			{
+				zgfx_GetBits(zgfx, 1);
+				inPrefix = (inPrefix << 1) + zgfx->bits;
+				haveBits++;
+			}
+
+			if (inPrefix == ZGFX_TOKEN_TABLE[opIndex].prefixCode)
+			{
+				if (ZGFX_TOKEN_TABLE[opIndex].tokenType == 0)
+				{
+					/* Literal */
+					zgfx_GetBits(zgfx, ZGFX_TOKEN_TABLE[opIndex].valueBits);
+					c = (BYTE)(ZGFX_TOKEN_TABLE[opIndex].valueBase + zgfx->bits);
+					zgfx->HistoryBuffer[zgfx->HistoryIndex] = c;
+
+					if (++zgfx->HistoryIndex == zgfx->HistoryBufferSize)
+						zgfx->HistoryIndex = 0;
+
+					if (zgfx->OutputCount >= sizeof(zgfx->OutputBuffer))
+						return FALSE;
+
+					zgfx->OutputBuffer[zgfx->OutputCount++] = c;
+				}
+				else
+				{
+					zgfx_GetBits(zgfx, ZGFX_TOKEN_TABLE[opIndex].valueBits);
+					distance = ZGFX_TOKEN_TABLE[opIndex].valueBase + zgfx->bits;
+
+					if (distance != 0)
+					{
+						/* Match */
+						zgfx_GetBits(zgfx, 1);
+
+						if (zgfx->bits == 0)
+						{
+							count = 3;
+						}
+						else
+						{
+							count = 4;
+							extra = 2;
+							zgfx_GetBits(zgfx, 1);
+
+							while (zgfx->bits == 1)
+							{
+								count *= 2;
+								extra++;
+								zgfx_GetBits(zgfx, 1);
+							}
+
+							zgfx_GetBits(zgfx, extra);
+							count += zgfx->bits;
+						}
+
+						if (count > sizeof(zgfx->OutputBuffer) - zgfx->OutputCount)
+							return FALSE;
+
+						zgfx_history_buffer_ring_read(zgfx, WINPR_ASSERTING_INT_CAST(int, distance),
+						                              &(zgfx->OutputBuffer[zgfx->OutputCount]),
+						                              count);
+						zgfx_history_buffer_ring_write(
+						    zgfx, &(zgfx->OutputBuffer[zgfx->OutputCount]), count);
+						zgfx->OutputCount += count;
+					}
+					else
+					{
+						/* Unencoded */
+						zgfx_GetBits(zgfx, 15);
+						count = zgfx->bits;
+						zgfx->cBitsRemaining -= zgfx->cBitsCurrent;
+						zgfx->cBitsCurrent = 0;
+						zgfx->BitsCurrent = 0;
+
+						if (count > sizeof(zgfx->OutputBuffer) - zgfx->OutputCount)
+							return FALSE;
+						else if (count > zgfx->cBitsRemaining / 8)
+							return FALSE;
+						else if (zgfx->pbInputCurrent + count > zgfx->pbInputEnd)
+							return FALSE;
+
+						CopyMemory(&(zgfx->OutputBuffer[zgfx->OutputCount]), zgfx->pbInputCurrent,
+						           count);
+						zgfx_history_buffer_ring_write(zgfx, zgfx->pbInputCurrent, count);
+						zgfx->pbInputCurrent += count;
+						zgfx->cBitsRemaining -= (8 * count);
+						zgfx->OutputCount += count;
+					}
+				}
+
+				break;
+			}
+		}
+	}
+
+	return TRUE;
+}
+
+/* Allocate the buffers a bit larger.
+ *
+ * Due to optimizations some h264 decoders will read data beyond
+ * the actual available data, so ensure that it will never be a
+ * out of bounds read.
+ */
+static INLINE BYTE* aligned_zgfx_malloc(size_t size)
+{
+	return malloc(size + 64);
+}
+
+static INLINE BOOL zgfx_append(ZGFX_CONTEXT* WINPR_RESTRICT zgfx,
+                               BYTE** WINPR_RESTRICT ppConcatenated, size_t uncompressedSize,
+                               size_t* WINPR_RESTRICT pUsed)
+{
+	WINPR_ASSERT(zgfx);
+	WINPR_ASSERT(ppConcatenated);
+	WINPR_ASSERT(pUsed);
+
+	const size_t used = *pUsed;
+	if (zgfx->OutputCount > UINT32_MAX - used)
+		return FALSE;
+
+	if (used + zgfx->OutputCount > uncompressedSize)
+		return FALSE;
+
+	BYTE* tmp = realloc(*ppConcatenated, used + zgfx->OutputCount + 64ull);
+	if (!tmp)
+		return FALSE;
+	*ppConcatenated = tmp;
+	CopyMemory(&tmp[used], zgfx->OutputBuffer, zgfx->OutputCount);
+	*pUsed = used + zgfx->OutputCount;
+	return TRUE;
+}
+
+int zgfx_decompress(ZGFX_CONTEXT* WINPR_RESTRICT zgfx, const BYTE* WINPR_RESTRICT pSrcData,
+                    UINT32 SrcSize, BYTE** WINPR_RESTRICT ppDstData,
+                    UINT32* WINPR_RESTRICT pDstSize, UINT32 flags)
+{
+	int status = -1;
+	BYTE descriptor = 0;
+	wStream sbuffer = { 0 };
+	size_t used = 0;
+	BYTE* pConcatenated = NULL;
+	wStream* stream = Stream_StaticConstInit(&sbuffer, pSrcData, SrcSize);
+
+	WINPR_ASSERT(zgfx);
+	WINPR_ASSERT(stream);
+	WINPR_ASSERT(ppDstData);
+	WINPR_ASSERT(pDstSize);
+
+	*ppDstData = NULL;
+	*pDstSize = 0;
+
+	if (!Stream_CheckAndLogRequiredLength(TAG, stream, 1))
+		goto fail;
+
+	Stream_Read_UINT8(stream, descriptor); /* descriptor (1 byte) */
+
+	if (descriptor == ZGFX_SEGMENTED_SINGLE)
+	{
+		if (!zgfx_decompress_segment(zgfx, stream, Stream_GetRemainingLength(stream)))
+			goto fail;
+
+		if (zgfx->OutputCount > 0)
+		{
+			if (!zgfx_append(zgfx, &pConcatenated, zgfx->OutputCount, &used))
+				goto fail;
+			if (used != zgfx->OutputCount)
+				goto fail;
+			*ppDstData = pConcatenated;
+			*pDstSize = zgfx->OutputCount;
+		}
+	}
+	else if (descriptor == ZGFX_SEGMENTED_MULTIPART)
+	{
+		UINT32 segmentSize = 0;
+		UINT16 segmentNumber = 0;
+		UINT16 segmentCount = 0;
+		UINT32 uncompressedSize = 0;
+
+		if (!Stream_CheckAndLogRequiredLength(TAG, stream, 6))
+			goto fail;
+
+		Stream_Read_UINT16(stream, segmentCount);     /* segmentCount (2 bytes) */
+		Stream_Read_UINT32(stream, uncompressedSize); /* uncompressedSize (4 bytes) */
+
+		for (segmentNumber = 0; segmentNumber < segmentCount; segmentNumber++)
+		{
+			if (!Stream_CheckAndLogRequiredLength(TAG, stream, sizeof(UINT32)))
+				goto fail;
+
+			Stream_Read_UINT32(stream, segmentSize); /* segmentSize (4 bytes) */
+
+			if (!zgfx_decompress_segment(zgfx, stream, segmentSize))
+				goto fail;
+
+			if (!zgfx_append(zgfx, &pConcatenated, uncompressedSize, &used))
+				goto fail;
+		}
+
+		if (used != uncompressedSize)
+			goto fail;
+
+		*ppDstData = pConcatenated;
+		*pDstSize = uncompressedSize;
+	}
+	else
+	{
+		goto fail;
+	}
+
+	status = 1;
+fail:
+	if (status < 0)
+		free(pConcatenated);
+	return status;
+}
+
+static BOOL zgfx_compress_segment(ZGFX_CONTEXT* WINPR_RESTRICT zgfx, wStream* WINPR_RESTRICT s,
+                                  const BYTE* WINPR_RESTRICT pSrcData, UINT32 SrcSize,
+                                  UINT32* WINPR_RESTRICT pFlags)
+{
+	/* FIXME: Currently compression not implemented. Just copy the raw source */
+	if (!Stream_EnsureRemainingCapacity(s, SrcSize + 1))
+	{
+		WLog_ERR(TAG, "Stream_EnsureRemainingCapacity failed!");
+		return FALSE;
+	}
+
+	(*pFlags) |= ZGFX_PACKET_COMPR_TYPE_RDP8; /* RDP 8.0 compression format */
+	Stream_Write_UINT8(s, WINPR_ASSERTING_INT_CAST(uint8_t, *pFlags)); /* header (1 byte) */
+	Stream_Write(s, pSrcData, SrcSize);
+	return TRUE;
+}
+
+int zgfx_compress_to_stream(ZGFX_CONTEXT* WINPR_RESTRICT zgfx, wStream* WINPR_RESTRICT sDst,
+                            const BYTE* WINPR_RESTRICT pUncompressed, UINT32 uncompressedSize,
+                            UINT32* WINPR_RESTRICT pFlags)
+{
+	int fragment = 0;
+	UINT16 maxLength = 0;
+	UINT32 totalLength = 0;
+	size_t posSegmentCount = 0;
+	const BYTE* pSrcData = NULL;
+	int status = 0;
+	maxLength = ZGFX_SEGMENTED_MAXSIZE;
+	totalLength = uncompressedSize;
+	pSrcData = pUncompressed;
+
+	for (; (totalLength > 0) || (fragment == 0); fragment++)
+	{
+		size_t posDstSize = 0;
+		size_t posDataStart = 0;
+
+		const UINT32 SrcSize = (totalLength > maxLength) ? maxLength : totalLength;
+		posDstSize = 0;
+		totalLength -= SrcSize;
+
+		/* Ensure we have enough space for headers */
+		if (!Stream_EnsureRemainingCapacity(sDst, 12))
+		{
+			WLog_ERR(TAG, "Stream_EnsureRemainingCapacity failed!");
+			return -1;
+		}
+
+		if (fragment == 0)
+		{
+			/* First fragment */
+			/* descriptor (1 byte) */
+			Stream_Write_UINT8(sDst, (totalLength == 0) ? ZGFX_SEGMENTED_SINGLE
+			                                            : ZGFX_SEGMENTED_MULTIPART);
+
+			if (totalLength > 0)
+			{
+				posSegmentCount = Stream_GetPosition(sDst); /* segmentCount (2 bytes) */
+				Stream_Seek(sDst, 2);
+				Stream_Write_UINT32(sDst, uncompressedSize); /* uncompressedSize (4 bytes) */
+			}
+		}
+
+		if (fragment > 0 || totalLength > 0)
+		{
+			/* Multipart */
+			posDstSize = Stream_GetPosition(sDst); /* size (4 bytes) */
+			Stream_Seek(sDst, 4);
+		}
+
+		posDataStart = Stream_GetPosition(sDst);
+
+		if (!zgfx_compress_segment(zgfx, sDst, pSrcData, SrcSize, pFlags))
+			return -1;
+
+		if (posDstSize)
+		{
+			/* Fill segment data size */
+			const size_t DstSize = Stream_GetPosition(sDst) - posDataStart;
+			if (DstSize > UINT32_MAX)
+				return -1;
+			Stream_SetPosition(sDst, posDstSize);
+			Stream_Write_UINT32(sDst, (UINT32)DstSize);
+			Stream_SetPosition(sDst, posDataStart + DstSize);
+		}
+
+		pSrcData += SrcSize;
+	}
+
+	Stream_SealLength(sDst);
+
+	/* fill back segmentCount */
+	if (posSegmentCount)
+	{
+		Stream_SetPosition(sDst, posSegmentCount);
+		Stream_Write_UINT16(sDst, WINPR_ASSERTING_INT_CAST(uint16_t, fragment));
+		Stream_SetPosition(sDst, Stream_Length(sDst));
+	}
+
+	return status;
+}
+
+int zgfx_compress(ZGFX_CONTEXT* WINPR_RESTRICT zgfx, const BYTE* WINPR_RESTRICT pSrcData,
+                  UINT32 SrcSize, BYTE** WINPR_RESTRICT ppDstData, UINT32* WINPR_RESTRICT pDstSize,
+                  UINT32* WINPR_RESTRICT pFlags)
+{
+	int status = 0;
+	wStream* s = Stream_New(NULL, SrcSize);
+	status = zgfx_compress_to_stream(zgfx, s, pSrcData, SrcSize, pFlags);
+	const size_t pos = Stream_GetPosition(s);
+	if (pos > UINT32_MAX)
+		status = -1;
+	else
+	{
+		(*ppDstData) = Stream_Buffer(s);
+		(*pDstSize) = (UINT32)pos;
+	}
+	Stream_Free(s, FALSE);
+	return status;
+}
+
+void zgfx_context_reset(ZGFX_CONTEXT* WINPR_RESTRICT zgfx, BOOL flush)
+{
+	zgfx->HistoryIndex = 0;
+}
+
+ZGFX_CONTEXT* zgfx_context_new(BOOL Compressor)
+{
+	ZGFX_CONTEXT* zgfx = NULL;
+	zgfx = (ZGFX_CONTEXT*)calloc(1, sizeof(ZGFX_CONTEXT));
+
+	if (zgfx)
+	{
+		zgfx->Compressor = Compressor;
+		zgfx->HistoryBufferSize = sizeof(zgfx->HistoryBuffer);
+		zgfx_context_reset(zgfx, FALSE);
+	}
+
+	return zgfx;
+}
+
+void zgfx_context_free(ZGFX_CONTEXT* zgfx)
+{
+	free(zgfx);
+}