diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index ea2bdeec8..1f12800b4 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -122,6 +122,10 @@ Tato aplikace neobsahuje žádné reklamy, nevyužívá připojení k síti a je
End
Správce schránky
+
+
+
+
Nedávno kopírovaný text
Připnout
Odebrat ze schránky?
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 01e0b085f..0e651e6c2 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -122,6 +122,10 @@ Diese App enthält keine Werbung, benötigt keinen Netzwerkzugriff und ist quell
Ende
Clipboard-Manager
+
+
+
+
Zuletzt kopierter Text
Angeheftet
Aus der Zwischenablage entfernen?
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 965330921..b1e0abd1a 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -122,6 +122,10 @@ La misma no contiene ningún anuncio/publicidad, no realiza peticiones de red y
Fin
Arreglar portapapeles
+
+
+
+
Textos recién copiados
Pegado
¿Sacar este portapapeles?
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 3c0837002..3f31c6537 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -122,6 +122,10 @@ This application contains no ads, doesn't make any network requests and is Open
+
+
+
+
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 64b57129a..cf3656cf7 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -122,6 +122,10 @@ Cette application ne contient pas de publicité, n'accède pas au réseau et est
Fin
Presse-papiers
+
+
+
+
Texte récemment copié
Épinglé
Supprimer ce presse-papiers ?
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 8e86f94b8..74ddf3bab 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -122,6 +122,10 @@ This application contains no ads, doesn't make any network requests and is Open
+
+
+
+
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index ebe86907b..5325809d7 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -123,6 +123,10 @@ PCキーボードでの半角入力を再現しています。日本語入力、
End
クリップボード
+
+
+
+
最近コピーしたテキスト
お気に入り
クリップボードから削除しますか?
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 954fab7f8..27b6da80c 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -122,6 +122,10 @@
종료
클립보드 관리자
+
+
+
+
최근에 복사한 텍스트
고정
이 클립보드를 제거하시겠습니까?
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index a8727901e..1f9361b51 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -124,6 +124,10 @@ Tagad lieliski piemērota izmantošanai ikdienā.
Beigas
Starpliktuves pārvaldnieks
+
+
+
+
Nesen starpliktuvē ievietots teksts
Piesprausts
Noņemt šo starpliktuves vienumu?
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 6a426fc38..4ec933883 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -122,6 +122,10 @@ Aplikacja nie zawiera reklam, nie żąda dostępu do internetu, a jej kod źród
End
Zarządzanie schowkiem
+
+
+
+
Ostatnio skopiowane elementy
Przypięte
Usunąć ten element ze schowka?
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index a369715cd..61ff69a86 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -122,6 +122,10 @@ Este aplicativo não contém anúncios, não faz nenhuma solicitação de rede e
End
Área de transferência
Combinação de diacríticos
+
+
+
+
Textos recém copiados
Fixados
Remover esta cópia?
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 3746f886f..a19b1182d 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -122,6 +122,10 @@ Această aplicație nu conține publicitate, nu folosește rețeaua deloc și e
+
+
+
+
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 9a795ad97..110647ad7 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -122,6 +122,10 @@
End
Менеджер буфера обмена
Сочетание диакритических знаков
+
+
+
+
Недавно скопированный текст
Закреплено
Удалить этот буфер обмена?
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 6281db467..6c3b3165b 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -122,6 +122,10 @@ Bu uygulama açık kaynaklıdır. Reklam içermez ve internete bağlanmaz."SON(Sağ yön tuşu)
Pano
+
+
+
+
Son kopyalanan metin
Sabitlendi
Bu sabitlemeyi sil
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 4bed38926..31eae962b 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -122,6 +122,10 @@
End
Менеджер буфера обміну
Комбінування діакритики
+
+
+
+
Нещодавно скопійований текст
Закріплено
Видалити цей буфер обміну?
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 2bb8e8a05..2b7ab930f 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -122,6 +122,10 @@ Bây giờ đã hoàn hảo cho việc sử dụng hàng ngày.
+
+
+
+
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index ae9550c3d..ee84f2dc9 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -122,6 +122,10 @@
End
+
+
+
+
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 9c0818562..3efcfdddb 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -122,6 +122,10 @@ This application contains no ads, doesn't make any network requests and is Open
End
Clipboard manager
Combining diacritic
+ Zero width joiner
+ Zero width non-joiner
+ Non-breaking space
+ Narrow non-breaking space
Recently copied text
Pinned
Remove this clipboard?
diff --git a/srcs/juloo.keyboard2/prefs/ExtraKeysPreference.java b/srcs/juloo.keyboard2/prefs/ExtraKeysPreference.java
index 08260aa5b..92c7d3a36 100644
--- a/srcs/juloo.keyboard2/prefs/ExtraKeysPreference.java
+++ b/srcs/juloo.keyboard2/prefs/ExtraKeysPreference.java
@@ -51,6 +51,10 @@ public class ExtraKeysPreference extends PreferenceCategory
"†",
"ª",
"º",
+ "zwj",
+ "zwnj",
+ "nbsp",
+ "nnbsp",
"tab",
"esc",
"page_up",
@@ -164,6 +168,10 @@ static String key_description(Resources res, String name)
case "ª": id = R.string.key_descr_ª; break;
case "º": id = R.string.key_descr_º; break;
case "switch_clipboard": id = R.string.key_descr_clipboard; break;
+ case "zwj": id = R.string.key_descr_zwj; break;
+ case "zwnj": id = R.string.key_descr_zwnj; break;
+ case "nbsp": id = R.string.key_descr_nbsp; break;
+ case "nnbsp": id = R.string.key_descr_nnbsp; break;
case "combining_dot_above":
case "combining_double_aigu":