diff --git a/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/fragments/settings/MiscFragment.java b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/fragments/settings/MiscFragment.java
index bb4e0e0..b7c1817 100644
--- a/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/fragments/settings/MiscFragment.java
+++ b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/fragments/settings/MiscFragment.java
@@ -25,6 +25,7 @@ public class MiscFragment extends BaseSettingsFragment {
         addCheckedAction(R.string.increase_kbd_size, R.string.increase_kbd_size_desc, mPrefs::getEnlargeKeyboard, mPrefs::setEnlargeKeyboard);
         addCheckedAction(R.string.enable_suggestions, R.string.enable_suggestions_desc, mPrefs::getSuggestionsEnabled, mPrefs::setSuggestionsEnabled);
         addCheckedAction(R.string.show_launcher_icon, R.string.show_launcher_icon_desc, this::getLauncherIconShown, this::setLauncherIconShown);
+        addCheckedAction(R.string.enable_cyclic_navigation, R.string.enable_cyclic_navigation_desc, mPrefs::getCyclicNavigationEnabled, mPrefs::setCyclicNavigationEnabled);
     }
 
     @NonNull
diff --git a/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/ime/LeanbackKeyboardContainer.java b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/ime/LeanbackKeyboardContainer.java
index ecd568f..ce86dcc 100644
--- a/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/ime/LeanbackKeyboardContainer.java
+++ b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/ime/LeanbackKeyboardContainer.java
@@ -738,19 +738,9 @@ public class LeanbackKeyboardContainer {
                         return true;
                     }
                 } else {
-                    boolean left;
-                    if ((direction & DIRECTION_LEFT) != 0) {
-                        left = true;
-                    } else {
-                        left = false;
-                    }
+                    boolean left = (direction & DIRECTION_LEFT) != 0;
 
-                    boolean right;
-                    if ((direction & DIRECTION_RIGHT) != 0) {
-                        right = true;
-                    } else {
-                        right = false;
-                    }
+                    boolean right = (direction & DIRECTION_RIGHT) != 0;
 
                     if (left || right) {
                         offsetRect(mRect, mRootView);
diff --git a/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/ime/LeanbackKeyboardController.java b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/ime/LeanbackKeyboardController.java
index 257b5df..35db496 100644
--- a/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/ime/LeanbackKeyboardController.java
+++ b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/ime/LeanbackKeyboardController.java
@@ -16,7 +16,6 @@ import android.view.inputmethod.EditorInfo;
 import android.widget.Button;
 import android.widget.RelativeLayout;
 import androidx.annotation.NonNull;
-import com.liskovsoft.leankeyboard.addons.keyboards.KeyboardManager.KeyboardData;
 import com.liskovsoft.leankeyboard.ime.LeanbackKeyboardContainer.KeyFocus;
 import com.liskovsoft.leankeyboard.ime.pano.util.TouchNavSpaceTracker;
 import com.liskovsoft.leankeykeyboard.R;
@@ -37,7 +36,7 @@ public class LeanbackKeyboardController implements LeanbackKeyboardContainer.Voi
     private LeanbackKeyboardContainer mContainer;
     private InputMethodService mContext;
     private DoubleClickDetector mDoubleClickDetector;
-    private LeanbackKeyboardContainer.KeyFocus mDownFocus;
+    private LeanbackKeyboardContainer.KeyFocus mCurrentFocus;
     private Handler mHandler;
     private InputListener mInputListener;
     ArrayList<KeyChange> mKeyChangeHistory;
@@ -81,7 +80,7 @@ public class LeanbackKeyboardController implements LeanbackKeyboardContainer.Voi
 
         };
         mTouchEventListener = new TouchEventListener();
-        mDownFocus = new KeyFocus();
+        mCurrentFocus = new KeyFocus();
         mTempFocus = new KeyFocus();
         mKeyChangeHistory = new ArrayList<>(11);
         mTempPoint = new PointF();
@@ -576,9 +575,29 @@ public class LeanbackKeyboardController implements LeanbackKeyboardContainer.Voi
     }
 
     private boolean onDirectionalMove(int dir) {
-        if (mContainer.getNextFocusInDirection(dir, mDownFocus, mTempFocus)) {
+        if (mContainer.getNextFocusInDirection(dir, mCurrentFocus, mTempFocus)) {
+            if (mCurrentFocus.equals(mTempFocus)) {
+                String direction = "UNKNOWN";
+
+                switch (dir) {
+                    case LeanbackKeyboardContainer.DIRECTION_DOWN:
+                        direction = "DOWN";
+                        break;
+                    case LeanbackKeyboardContainer.DIRECTION_LEFT:
+                        direction = "LEFT";
+                        break;
+                    case LeanbackKeyboardContainer.DIRECTION_RIGHT:
+                        direction = "RIGHT";
+                        break;
+                    case LeanbackKeyboardContainer.DIRECTION_UP:
+                        direction = "UP";
+                        break;
+                }
+
+                Log.d(TAG, "Same key focus found! Direction: " + direction + " Key Label: " + mCurrentFocus.label);
+            }
             mContainer.setFocus(mTempFocus);
-            mDownFocus.set(mTempFocus);
+            mCurrentFocus.set(mTempFocus);
             clearKeyIfNecessary();
         }
 
@@ -695,7 +714,7 @@ public class LeanbackKeyboardController implements LeanbackKeyboardContainer.Voi
         //if (event.getDeviceId() > 0 && event.isPrintingKey()) onPhysicalKeyboardKeyPressed();
         if (event.isPrintingKey()) onPhysicalKeyboardKeyPressed();
 
-        mDownFocus.set(mContainer.getCurrFocus());
+        mCurrentFocus.set(mContainer.getCurrFocus());
         if (mSpaceTracker != null && mSpaceTracker.onKeyDown(keyCode, event)) {
             return true;
         } else {
diff --git a/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/utils/LeanKeyPreferences.java b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/utils/LeanKeyPreferences.java
index b81d742..ca3d24e 100644
--- a/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/utils/LeanKeyPreferences.java
+++ b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/utils/LeanKeyPreferences.java
@@ -16,6 +16,7 @@ public final class LeanKeyPreferences {
     public static final String THEME_DARK2 = "Dark2";
     public static final String THEME_DARK3 = "Dark3";
     private static final String SUGGESTIONS_ENABLED = "suggestionsEnabled";
+    private static final String CYCLIC_NAVIGATION_ENABLED = "cyclicNavigationEnabled";
     private static LeanKeyPreferences sInstance;
     private final Context mContext;
     private SharedPreferences mPrefs;
@@ -100,4 +101,14 @@ public final class LeanKeyPreferences {
     public boolean getSuggestionsEnabled() {
         return mPrefs.getBoolean(SUGGESTIONS_ENABLED, true);
     }
+
+    public void setCyclicNavigationEnabled(boolean enabled) {
+        mPrefs.edit()
+                .putBoolean(CYCLIC_NAVIGATION_ENABLED, enabled)
+                .apply();
+    }
+
+    public boolean getCyclicNavigationEnabled() {
+        return mPrefs.getBoolean(CYCLIC_NAVIGATION_ENABLED, true);
+    }
 }
diff --git a/leankeykeyboard/src/main/res/values-ar/strings.xml b/leankeykeyboard/src/main/res/values-ar/strings.xml
index 2dc9afd..4f4a66d 100644
--- a/leankeykeyboard/src/main/res/values-ar/strings.xml
+++ b/leankeykeyboard/src/main/res/values-ar/strings.xml
@@ -18,4 +18,45 @@
     <string name="keyboardview_keycode_right">لليمين</string>
     <string name="keyboard_headset_required_to_hear_password">يمكنك توصيل سماعة رأس لسماع مفاتيح كلمة المرور عندما يتم نطقها.</string>
     <string name="keyboard_password_character_no_headset">نقطة</string>
+
+    <!--  BEGIN: autotranslated strings  -->
+    <string name="subtype_generic">٪س</string>
+    <string name="keyboardview_keycode_lang">لغة</string>
+    <string name="keyboardview_keycode_voice">مدخل الصوت</string>
+    <string name="language_dialog_title">حدد تخطيطات إضافية</string>
+    <string name="language_dialog_subtitle">لفتح مربع حوار في المرة القادمة ، اضغط مع الاستمرار على زر \"العالم \"</string>
+    <string name="user_name">اسم المستخدم</string>
+    <string name="email_id">البريد الإلكتروني</string>
+    <string name="kb_layout_desc">تخطيط لوحة المفاتيح</string>
+    <string name="kb_layout">نسق</string>
+    <string name="kb_settings">الإعدادات</string>
+    <string name="kb_settings_desc">إعدادات لوحة المفاتيح</string>
+    <string name="activate_keyboard">تنشيط لوحة المفاتيح</string>
+    <string name="change_layout">غير الواجهة او التصميم</string>
+    <string name="enable_kb_in_system_prefs">تحتاج إلى تمكين٪ s في تفضيلات النظام</string>
+    <string name="about">حول</string>
+    <string name="about_desc">عن التطبيق</string>
+    <string name="keep_on_screen_desc">احتفظ به على الشاشة أثناء تنشيط لوحة المفاتيح الفعلية</string>
+    <string name="misc">متفرقات</string>
+    <string name="misc_desc">إعدادات متنوعة</string>
+    <string name="keep_on_screen">ابق على الشاشة</string>
+    <string name="keyboardview_keycode_clipboard">الحافظة</string>
+    <string name="increase_kbd_size">تكبير لوحة المفاتيح</string>
+    <string name="increase_kbd_size_desc">زيادة حجم لوحة المفاتيح</string>
+    <string name="kbd_activation_error2">حدث خطأ. حاول تنشيط٪ s باستخدام الأوامر أدناه. \n\n٪ s \n\n٪ s</string>
+    <string name="about_donate">تبرع</string>
+    <string name="about_web_site">موقع الكتروني</string>
+    <string name="kbd_activation_error">لا يمكن فتح إعدادات kbd للنظام. \nإعادة التوجيه إلى الموقع بتعليمات يدوية ...</string>
+    <string name="about_issue">إرسال قضية</string>
+    <string name="about_releases">احصل على نسخة جديدة</string>
+    <string name="kb_theme">موضوع</string>
+    <string name="kb_theme_desc">موضوع لوحة المفاتيح</string>
+    <string name="change_theme">غير الخلفية</string>
+    <string name="enable_suggestions">تمكين الاقتراحات</string>
+    <string name="enable_suggestions_desc">تمكين صف الاقتراحات</string>
+    <string name="show_launcher_icon">إظهار الرمز</string>
+    <string name="show_launcher_icon_desc">إظهار أيقونة المشغل</string>
+    <string name="enable_cyclic_navigation">التنقل الدوري</string>
+    <string name="enable_cyclic_navigation_desc">التنقل الدوري من خلال لوحة المفاتيح</string>
+    <!--  END: autotranslated strings  -->
 </resources>
diff --git a/leankeykeyboard/src/main/res/values-bg/strings.xml b/leankeykeyboard/src/main/res/values-bg/strings.xml
index a77b198..bef525f 100644
--- a/leankeykeyboard/src/main/res/values-bg/strings.xml
+++ b/leankeykeyboard/src/main/res/values-bg/strings.xml
@@ -18,4 +18,45 @@
     <string name="keyboardview_keycode_right">Right</string>
     <string name="keyboard_headset_required_to_hear_password">Включете слушалки, за да чуете изговарянето на клавишите за паролата.</string>
     <string name="keyboard_password_character_no_headset">Точка.</string>
+
+    <!--  BEGIN: autotranslated strings  -->
+    <string name="subtype_generic">%с</string>
+    <string name="keyboardview_keycode_lang">език</string>
+    <string name="keyboardview_keycode_voice">Гласов вход</string>
+    <string name="language_dialog_title">Изберете допълнителни оформления</string>
+    <string name="language_dialog_subtitle">За да отворите диалоговия прозорец следващия път, дълго натиснете бутона \"свят \"</string>
+    <string name="user_name">Потребителско име</string>
+    <string name="email_id">електронна поща</string>
+    <string name="kb_layout_desc">Клавиатурна подредба</string>
+    <string name="kb_layout">оформление</string>
+    <string name="kb_settings">Настройки</string>
+    <string name="kb_settings_desc">Настройки на клавиатурата</string>
+    <string name="activate_keyboard">Активирайте клавиатурата</string>
+    <string name="change_layout">Промяна на оформлението</string>
+    <string name="enable_kb_in_system_prefs">Трябва да активирате %s в системни предпочитания</string>
+    <string name="about">относно</string>
+    <string name="about_desc">Относно приложението</string>
+    <string name="keep_on_screen_desc">Дръжте го на екрана, докато физическата клавиатура е активна</string>
+    <string name="misc">Разни</string>
+    <string name="misc_desc">Разни настройки</string>
+    <string name="keep_on_screen">Дръжте на екрана</string>
+    <string name="keyboardview_keycode_clipboard">клипборда</string>
+    <string name="increase_kbd_size">Уголемяване на клавиатурата</string>
+    <string name="increase_kbd_size_desc">Увеличете размера на клавиатурата</string>
+    <string name="kbd_activation_error2">Възникна грешка. Опитайте да активирате %s с команди по-долу. \N \n%s \n\n%s</string>
+    <string name="about_donate">Дарете</string>
+    <string name="about_web_site">Уеб сайт</string>
+    <string name="kbd_activation_error">Не мога да отворя настройките на системния kbd. \NПренасочване към сайта с ръчни инструкции ...</string>
+    <string name="about_issue">Изпратете проблем</string>
+    <string name="about_releases">Вземете нова версия</string>
+    <string name="kb_theme">тема</string>
+    <string name="kb_theme_desc">Тема на клавиатурата</string>
+    <string name="change_theme">Промяна на темата</string>
+    <string name="enable_suggestions">Активиране на предложенията</string>
+    <string name="enable_suggestions_desc">Активиране на реда с предложения</string>
+    <string name="show_launcher_icon">Показване на икона</string>
+    <string name="show_launcher_icon_desc">Показване на иконата на стартовия панел</string>
+    <string name="enable_cyclic_navigation">Циклична навигация</string>
+    <string name="enable_cyclic_navigation_desc">Циклична навигация през клавиатурата</string>
+    <!--  END: autotranslated strings  -->
 </resources>
diff --git a/leankeykeyboard/src/main/res/values-el/strings.xml b/leankeykeyboard/src/main/res/values-el/strings.xml
index e22e90a..bd58046 100644
--- a/leankeykeyboard/src/main/res/values-el/strings.xml
+++ b/leankeykeyboard/src/main/res/values-el/strings.xml
@@ -18,4 +18,45 @@
     <string name="keyboardview_keycode_right">Δεξιά</string>
     <string name="keyboard_headset_required_to_hear_password">Συνδέστε ακουστικά για να ακούσετε τα πλήκτρα του κωδικού πρόσβασης να εκφωνούνται.</string>
     <string name="keyboard_password_character_no_headset">Τελεία.</string>
+
+    <!--  BEGIN: autotranslated strings  -->
+    <string name="subtype_generic">%μικρό</string>
+    <string name="keyboardview_keycode_lang">Γλώσσα</string>
+    <string name="keyboardview_keycode_voice">Φωνητική είσοδος</string>
+    <string name="language_dialog_title">Επιλέξτε πρόσθετες διατάξεις</string>
+    <string name="language_dialog_subtitle">Για να ανοίξετε το διάλογο την επόμενη φορά, πατήστε παρατεταμένα το κουμπί \"κόσμος \"</string>
+    <string name="user_name">Ονομα χρήστη</string>
+    <string name="email_id">ΗΛΕΚΤΡΟΝΙΚΗ ΔΙΕΥΘΥΝΣΗ</string>
+    <string name="kb_layout_desc">Διάταξη πληκτρολογίου</string>
+    <string name="kb_layout">Σχέδιο</string>
+    <string name="kb_settings">Ρυθμίσεις</string>
+    <string name="kb_settings_desc">Ρυθμίσεις πληκτρολογίου</string>
+    <string name="activate_keyboard">Ενεργοποίηση πληκτρολογίου</string>
+    <string name="change_layout">Αλλαγή διάταξης</string>
+    <string name="enable_kb_in_system_prefs">Πρέπει να ενεργοποιήσετε το %s στις Προτιμήσεις συστήματος</string>
+    <string name="about">Σχετικά με</string>
+    <string name="about_desc">Σχετικά με την εφαρμογή</string>
+    <string name="keep_on_screen_desc">Διατηρήστε το στην οθόνη ενώ το φυσικό πληκτρολόγιο είναι ενεργό</string>
+    <string name="misc">Διάφορα</string>
+    <string name="misc_desc">Διάφορες ρυθμίσεις</string>
+    <string name="keep_on_screen">Κρατήστε στην οθόνη</string>
+    <string name="keyboardview_keycode_clipboard">Πρόχειρο</string>
+    <string name="increase_kbd_size">Μεγέθυνση πληκτρολογίου</string>
+    <string name="increase_kbd_size_desc">Αυξήστε το μέγεθος του πληκτρολογίου</string>
+    <string name="kbd_activation_error2">Προέκυψε σφάλμα. Προσπαθήστε να ενεργοποιήσετε το %s με τις παρακάτω εντολές. \N \n%s \n\n%s</string>
+    <string name="about_donate">Προσφέρω</string>
+    <string name="about_web_site">Ιστοσελίδα</string>
+    <string name="kbd_activation_error">Δεν είναι δυνατό το άνοιγμα των ρυθμίσεων kbd συστήματος. \NΑνακατεύθυνση στον ιστότοπο με μη αυτόματες οδηγίες…</string>
+    <string name="about_issue">Υποβάλετε ένα ζήτημα</string>
+    <string name="about_releases">Αποκτήστε μια νέα έκδοση</string>
+    <string name="kb_theme">Θέμα</string>
+    <string name="kb_theme_desc">Θέμα πληκτρολογίου</string>
+    <string name="change_theme">Αλλαξε θέμα</string>
+    <string name="enable_suggestions">Ενεργοποίηση προτάσεων</string>
+    <string name="enable_suggestions_desc">Ενεργοποίηση σειράς προτάσεων</string>
+    <string name="show_launcher_icon">Εμφάνιση εικονιδίου</string>
+    <string name="show_launcher_icon_desc">Εμφάνιση εικονιδίου εκκίνησης</string>
+    <string name="enable_cyclic_navigation">Κυκλική πλοήγηση</string>
+    <string name="enable_cyclic_navigation_desc">Κυκλική πλοήγηση μέσω πληκτρολογίου</string>
+    <!--  END: autotranslated strings  -->
 </resources>
diff --git a/leankeykeyboard/src/main/res/values-fa/strings.xml b/leankeykeyboard/src/main/res/values-fa/strings.xml
index ccd379f..c0973ae 100644
--- a/leankeykeyboard/src/main/res/values-fa/strings.xml
+++ b/leankeykeyboard/src/main/res/values-fa/strings.xml
@@ -18,4 +18,45 @@
     <string name="keyboardview_keycode_right">راست</string>
     <string name="keyboard_headset_required_to_hear_password">هدست را برای شنیدن کلیدهای گذرواژه که خوانده می‌شوند، وصل کنید.</string>
     <string name="keyboard_password_character_no_headset">نقطه.</string>
+
+    <!--  BEGIN: autotranslated strings  -->
+    <string name="subtype_generic">٪ s</string>
+    <string name="keyboardview_keycode_lang">زبان</string>
+    <string name="keyboardview_keycode_voice">ورودی صدا</string>
+    <string name="language_dialog_title">طرح بندی های اضافی را انتخاب کنید</string>
+    <string name="language_dialog_subtitle">برای باز کردن گفتگو دفعه بعد ، دکمه "جهان" را فشار دهید</string>
+    <string name="user_name">نام کاربری</string>
+    <string name="email_id">پست الکترونیک</string>
+    <string name="kb_layout_desc">چیدمان صفحه کلید</string>
+    <string name="kb_layout">چیدمان</string>
+    <string name="kb_settings">تنظیمات</string>
+    <string name="kb_settings_desc">تنظیمات صفحه کلید</string>
+    <string name="activate_keyboard">صفحه کلید را فعال کنید</string>
+    <string name="change_layout">طرح بندی را تغییر دهید</string>
+    <string name="enable_kb_in_system_prefs">شما باید٪ s را در تنظیمات برگزیده سیستم فعال کنید</string>
+    <string name="about">در باره</string>
+    <string name="about_desc">درباره برنامه</string>
+    <string name="keep_on_screen_desc">در حالی که صفحه کلید فیزیکی فعال است ، آن را روی صفحه نگه دارید</string>
+    <string name="misc">متفرقه</string>
+    <string name="misc_desc">تنظیمات متفرقه</string>
+    <string name="keep_on_screen">روی صفحه نگه دارید</string>
+    <string name="keyboardview_keycode_clipboard">کلیپ بورد</string>
+    <string name="increase_kbd_size">صفحه کلید را بزرگ کنید</string>
+    <string name="increase_kbd_size_desc">اندازه صفحه کلید را افزایش دهید</string>
+    <string name="kbd_activation_error2">خطا رخ داده است. سعی کنید٪ s را با دستورات زیر فعال کنید. \n\n٪ s \n\n٪ s</string>
+    <string name="about_donate">اهدا کنید</string>
+    <string name="about_web_site">سایت اینترنتی</string>
+    <string name="kbd_activation_error">نمی توانید تنظیمات سیستم kbd را باز کنید. \nبا هدایت دستی به سایت هدایت شوید ...</string>
+    <string name="about_issue">ارسال یک شماره</string>
+    <string name="about_releases">یک نسخه جدید دریافت کنید</string>
+    <string name="kb_theme">موضوع</string>
+    <string name="kb_theme_desc">تم صفحه کلید</string>
+    <string name="change_theme">تغییر زمینه</string>
+    <string name="enable_suggestions">پیشنهادات را فعال کنید</string>
+    <string name="enable_suggestions_desc">ردیف پیشنهادات را فعال کنید</string>
+    <string name="show_launcher_icon">نماد نمایش</string>
+    <string name="show_launcher_icon_desc">نماد پرتاب را نشان دهید</string>
+    <string name="enable_cyclic_navigation">ناوبری حلقوی</string>
+    <string name="enable_cyclic_navigation_desc">ناوبری حلقوی از طریق صفحه کلید</string>
+    <!--  END: autotranslated strings  -->
 </resources>
diff --git a/leankeykeyboard/src/main/res/values-fr/strings.xml b/leankeykeyboard/src/main/res/values-fr/strings.xml
index 2a9c3ff..4946133 100644
--- a/leankeykeyboard/src/main/res/values-fr/strings.xml
+++ b/leankeykeyboard/src/main/res/values-fr/strings.xml
@@ -18,4 +18,45 @@
     <string name="keyboardview_keycode_right">Droite</string>
     <string name="keyboard_headset_required_to_hear_password">"Branchez un casque pour entendre l'énoncé des touches lors de la saisie du mot de passe."</string>
     <string name="keyboard_password_character_no_headset">Point.</string>
+
+    <!--  BEGIN: autotranslated strings  -->
+    <string name="subtype_generic">%s</string>
+    <string name="keyboardview_keycode_lang">Langue</string>
+    <string name="keyboardview_keycode_voice">Entrée vocale</string>
+    <string name="language_dialog_title">Sélectionnez des dispositions supplémentaires</string>
+    <string name="language_dialog_subtitle">Pour ouvrir la boîte de dialogue la prochaine fois, appuyez longuement sur le bouton \\'monde \\'</string>
+    <string name="user_name">Nom d\'utilisateur</string>
+    <string name="email_id">Email</string>
+    <string name="kb_layout_desc">Clavier</string>
+    <string name="kb_layout">Disposition</string>
+    <string name="kb_settings">Paramètres</string>
+    <string name="kb_settings_desc">Paramètres du clavier</string>
+    <string name="activate_keyboard">Activer le clavier</string>
+    <string name="change_layout">Changer la disposition</string>
+    <string name="enable_kb_in_system_prefs">Vous devez activer %s dans les Préférences Système</string>
+    <string name="about">À propos</string>
+    <string name="about_desc">À propos de l\'application</string>
+    <string name="keep_on_screen_desc">Gardez-le à l\'écran lorsque le clavier physique est actif</string>
+    <string name="misc">Divers</string>
+    <string name="misc_desc">Paramètres divers</string>
+    <string name="keep_on_screen">Gardez à l\'écran</string>
+    <string name="keyboardview_keycode_clipboard">Presse-papiers</string>
+    <string name="increase_kbd_size">Agrandir le clavier</string>
+    <string name="increase_kbd_size_desc">Augmenter la taille du clavier</string>
+    <string name="kbd_activation_error2">Erreur est survenue. Essayez d\'activer %s avec les commandes ci-dessous. \N \n%s \n\n%s</string>
+    <string name="about_donate">Faire un don</string>
+    <string name="about_web_site">Site Internet</string>
+    <string name="kbd_activation_error">Impossible d\'ouvrir les paramètres du système kbd. \NRedirection vers le site avec des instructions manuelles…</string>
+    <string name="about_issue">Soumettre un problème</string>
+    <string name="about_releases">Obtenez une nouvelle version</string>
+    <string name="kb_theme">Thème</string>
+    <string name="kb_theme_desc">Thème du clavier</string>
+    <string name="change_theme">Change le thème</string>
+    <string name="enable_suggestions">Activer les suggestions</string>
+    <string name="enable_suggestions_desc">Activer la ligne des suggestions</string>
+    <string name="show_launcher_icon">Montrer l\'icône</string>
+    <string name="show_launcher_icon_desc">Afficher l\'icône du lanceur</string>
+    <string name="enable_cyclic_navigation">Navigation cyclique</string>
+    <string name="enable_cyclic_navigation_desc">Navigation cyclique via le clavier</string>
+    <!--  END: autotranslated strings  -->
 </resources>
diff --git a/leankeykeyboard/src/main/res/values-ru/strings.xml b/leankeykeyboard/src/main/res/values-ru/strings.xml
index 485d540..336dfbf 100644
--- a/leankeykeyboard/src/main/res/values-ru/strings.xml
+++ b/leankeykeyboard/src/main/res/values-ru/strings.xml
@@ -48,4 +48,6 @@
     <string name="enable_suggestions_desc">Отображать ряд с подсказками при вводе</string>
     <string name="show_launcher_icon">Отображать иконку</string>
     <string name="show_launcher_icon_desc">Отображать иконку лаунчера</string>
+    <string name="enable_cyclic_navigation">Циклическая навигация</string>
+    <string name="enable_cyclic_navigation_desc">Циклическая навигация по клавиатуре</string>
 </resources>
diff --git a/leankeykeyboard/src/main/res/values-uk/strings.xml b/leankeykeyboard/src/main/res/values-uk/strings.xml
index a80132e..b950c3f 100644
--- a/leankeykeyboard/src/main/res/values-uk/strings.xml
+++ b/leankeykeyboard/src/main/res/values-uk/strings.xml
@@ -48,4 +48,6 @@
     <string name="enable_suggestions_desc">Відображати ряд з підказками при вводі</string>
     <string name="show_launcher_icon">Відображати іконку</string>
     <string name="show_launcher_icon_desc">Відображати іконку лаунчера</string>
+    <string name="enable_cyclic_navigation">Циклічна навігація</string>
+    <string name="enable_cyclic_navigation_desc">Циклічна навігація по клавіатурі</string>
 </resources>
diff --git a/leankeykeyboard/src/main/res/values/strings.xml b/leankeykeyboard/src/main/res/values/strings.xml
index 30f458e..f0cf270 100644
--- a/leankeykeyboard/src/main/res/values/strings.xml
+++ b/leankeykeyboard/src/main/res/values/strings.xml
@@ -2,7 +2,7 @@
 <resources>
     <string name="ime_name" translatable="false">LeanKey Keyboard Pro</string>
     <string name="ime_service_name" translatable="false">LeanKey Keyboard Pro</string>
-    <string name="word_separators">" .,;:!?
+    <string name="word_separators" translatable="false">" .,;:!?
         ()[]*&amp;@{}/&lt;>_+=|"
     </string>
     <string name="label_go_key">Go</string>
@@ -59,4 +59,6 @@
     <string name="enable_suggestions_desc">Enable suggestions row</string>
     <string name="show_launcher_icon">Show icon</string>
     <string name="show_launcher_icon_desc">Show launcher icon</string>
+    <string name="enable_cyclic_navigation">Сyclic navigation</string>
+    <string name="enable_cyclic_navigation_desc">Сyclic navigation through keyboard</string>
 </resources>