From 32d4276f4096f71bd171ea058c95e6a7f72dc119 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Raphael=20St=C3=A4bler?= Date: Mon, 28 Nov 2022 18:15:02 +0100 Subject: [PATCH 1/2] Add support for default keyboard in composition view --- Localizations/ca.lproj/Localizable.strings | 3 +++ Localizations/cs.lproj/Localizable.strings | 3 +++ Localizations/de.lproj/Localizable.strings | 3 +++ Localizations/el.lproj/Localizable.strings | 3 +++ Localizations/en.lproj/Localizable.strings | 3 +++ Localizations/es.lproj/Localizable.strings | 3 +++ Localizations/eu.lproj/Localizable.strings | 3 +++ Localizations/fr.lproj/Localizable.strings | 3 +++ Localizations/gd.lproj/Localizable.strings | 3 +++ Localizations/he.lproj/Localizable.strings | 3 +++ Localizations/ja.lproj/Localizable.strings | 3 +++ Localizations/ko.lproj/Localizable.strings | 3 +++ Localizations/pl.lproj/Localizable.strings | 3 +++ Localizations/pt-BR.lproj/Localizable.strings | 3 +++ Localizations/ru.lproj/Localizable.strings | 3 +++ Localizations/sv.lproj/Localizable.strings | 3 +++ .../zh-Hans.lproj/Localizable.strings | 3 +++ .../zh-Hant.lproj/Localizable.strings | 3 +++ .../Utilities/AppPreferences.swift | 20 +++++++++++++++++++ Views/SwiftUI/PreferencesView.swift | 17 ++++++++++++++++ Views/UIKit/CompositionView.swift | 4 +++- 21 files changed, 94 insertions(+), 1 deletion(-) diff --git a/Localizations/ca.lproj/Localizable.strings b/Localizations/ca.lproj/Localizable.strings index e73cdd85..d47f1196 100644 --- a/Localizations/ca.lproj/Localizable.strings +++ b/Localizations/ca.lproj/Localizable.strings @@ -253,6 +253,9 @@ "preferences.require-double-tap-to-favorite" = "Cal que toquis dues vegades per fer-ho favorit"; "preferences.show-reblog-and-favorite-counts" = "Mostra el recompte d’impulsos i favorits"; "preferences.status-word" = "Paraula d’estat"; +"preferences.keyboard-type" = "Teclat"; +"preferences.keyboard-type.twitter" = "Twitter"; +"preferences.keyboard-type.default-text" = "Per defecte"; "filters.active" = "Actiu"; "filters.expired" = "Caducat"; "filter.add-new" = "Afegeix un filtre nou"; diff --git a/Localizations/cs.lproj/Localizable.strings b/Localizations/cs.lproj/Localizable.strings index 32acce97..2a33ac4c 100644 --- a/Localizations/cs.lproj/Localizable.strings +++ b/Localizations/cs.lproj/Localizable.strings @@ -253,6 +253,9 @@ "preferences.require-double-tap-to-favorite" = "Vyžadovat dvojité klepnutí pro oblíbené"; "preferences.show-reblog-and-favorite-counts" = "Zobrazit boostů a počet oblíbených"; "preferences.status-word" = "Toot/Příspěvek"; +"preferences.keyboard-type" = "Klávesnice"; +"preferences.keyboard-type.twitter" = "Twitter"; +"preferences.keyboard-type.default-text" = "Výchozí"; "filters.active" = "Aktivní"; "filters.expired" = "Platnost vypršela"; "filter.add-new" = "Přidat nový filtr"; diff --git a/Localizations/de.lproj/Localizable.strings b/Localizations/de.lproj/Localizable.strings index b7c294e3..0804c50e 100644 --- a/Localizations/de.lproj/Localizable.strings +++ b/Localizations/de.lproj/Localizable.strings @@ -253,6 +253,9 @@ "preferences.require-double-tap-to-favorite" = "Doppelklick zum Favorisieren"; "preferences.show-reblog-and-favorite-counts" = "Boosts und Favoriten anzeigen"; "preferences.status-word" = "Statuswort"; +"preferences.keyboard-type" = "Tastatur"; +"preferences.keyboard-type.twitter" = "Twitter"; +"preferences.keyboard-type.default-text" = "Standard"; "filters.active" = "Aktiv"; "filters.expired" = "Abgelaufen"; "filter.add-new" = "Neuer Filter"; diff --git a/Localizations/el.lproj/Localizable.strings b/Localizations/el.lproj/Localizable.strings index 01656652..53af6a9a 100644 --- a/Localizations/el.lproj/Localizable.strings +++ b/Localizations/el.lproj/Localizable.strings @@ -253,6 +253,9 @@ "preferences.require-double-tap-to-favorite" = "Να απαιτείται διπλό πάτημα για προσθήκη στα αγαπημένα"; "preferences.show-reblog-and-favorite-counts" = "Εμφάνιση μετρήσεων των boosts και αγαπημένων"; "preferences.status-word" = "Λέξη κατάστασης"; +"preferences.keyboard-type" = "Πληκτρολόγιο"; +"preferences.keyboard-type.twitter" = "Twitter"; +"preferences.keyboard-type.default-text" = "Προκαθορισμένο"; "filters.active" = "Ενεργό"; "filters.expired" = "Έληξε"; "filter.add-new" = "Προσθήκη Νέου Φίλτρου"; diff --git a/Localizations/en.lproj/Localizable.strings b/Localizations/en.lproj/Localizable.strings index f7f6054c..f4033705 100644 --- a/Localizations/en.lproj/Localizable.strings +++ b/Localizations/en.lproj/Localizable.strings @@ -253,6 +253,9 @@ "preferences.require-double-tap-to-favorite" = "Require double tap to favorite"; "preferences.show-reblog-and-favorite-counts" = "Show boost and favorite counts"; "preferences.status-word" = "Status word"; +"preferences.keyboard-type" = "Keyboard"; +"preferences.keyboard-type.twitter" = "Twitter"; +"preferences.keyboard-type.default-text" = "Default"; "filters.active" = "Active"; "filters.expired" = "Expired"; "filter.add-new" = "Add New Filter"; diff --git a/Localizations/es.lproj/Localizable.strings b/Localizations/es.lproj/Localizable.strings index ffb14de5..a86616fe 100644 --- a/Localizations/es.lproj/Localizable.strings +++ b/Localizations/es.lproj/Localizable.strings @@ -253,6 +253,9 @@ "preferences.require-double-tap-to-favorite" = "Requerir doble toque para añadir a favoritos"; "preferences.show-reblog-and-favorite-counts" = "Mostrar boost y cuentas favoritas"; "preferences.status-word" = "Palabra de estado"; +"preferences.keyboard-type" = "Teclado"; +"preferences.keyboard-type.twitter" = "Twitter"; +"preferences.keyboard-type.default-text" = "Defecto"; "filters.active" = "Activo"; "filters.expired" = "Ha caducado"; "filter.add-new" = "Añadir un filtro nuevo"; diff --git a/Localizations/eu.lproj/Localizable.strings b/Localizations/eu.lproj/Localizable.strings index 3be7c146..dd9c757a 100644 --- a/Localizations/eu.lproj/Localizable.strings +++ b/Localizations/eu.lproj/Localizable.strings @@ -253,6 +253,9 @@ "preferences.require-double-tap-to-favorite" = "Gogoko egiteko birritan sakatu behar da"; "preferences.show-reblog-and-favorite-counts" = "Erakutsi bultzada eta gogoko kopurua"; "preferences.status-word" = "Nahiago duzun hitza"; +"preferences.keyboard-type" = "Teklatua"; +"preferences.keyboard-type.twitter" = "Twitter"; +"preferences.keyboard-type.default-text" = "Lehenetsia"; "filters.active" = "Aktibo"; "filters.expired" = "Iraungita"; "filter.add-new" = "Gehitu iragazki berria"; diff --git a/Localizations/fr.lproj/Localizable.strings b/Localizations/fr.lproj/Localizable.strings index 6366047d..8c6d77ae 100644 --- a/Localizations/fr.lproj/Localizable.strings +++ b/Localizations/fr.lproj/Localizable.strings @@ -253,6 +253,9 @@ "preferences.require-double-tap-to-favorite" = "Nécessite un double appui pour ajouter aux favoris"; "preferences.show-reblog-and-favorite-counts" = "Afficher le nombre de partages/favoris"; "preferences.status-word" = "Mot de statut"; +"preferences.keyboard-type" = "Clavier"; +"preferences.keyboard-type.twitter" = "Twitter"; +"preferences.keyboard-type.default-text" = "Défaut"; "filters.active" = "Actifs"; "filters.expired" = "Expirés"; "filter.add-new" = "Ajouter un nouveau filtre"; diff --git a/Localizations/gd.lproj/Localizable.strings b/Localizations/gd.lproj/Localizable.strings index 211c54bc..3cb7e52a 100644 --- a/Localizations/gd.lproj/Localizable.strings +++ b/Localizations/gd.lproj/Localizable.strings @@ -253,6 +253,9 @@ "preferences.require-double-tap-to-favorite" = "Thoir gnogag dhùbailte airson annsachd a chruthachadh"; "preferences.show-reblog-and-favorite-counts" = "Seall cunntas nam brosnachaidhean ’s nan annsachdan"; "preferences.status-word" = "Facal puist"; +"preferences.keyboard-type" = "Meur-chlàr"; +"preferences.keyboard-type.twitter" = "Twitter"; +"preferences.keyboard-type.default-text" = "Bunaiteach"; "filters.active" = "Gnìomhach"; "filters.expired" = "Thàinig e gu crìoch"; "filter.add-new" = "Cuir criathrag ùr ris"; diff --git a/Localizations/he.lproj/Localizable.strings b/Localizations/he.lproj/Localizable.strings index 1bdd05a8..5fa2103d 100644 --- a/Localizations/he.lproj/Localizable.strings +++ b/Localizations/he.lproj/Localizable.strings @@ -253,6 +253,9 @@ "preferences.require-double-tap-to-favorite" = "דרוש לחיצה כפולה כדי להדהד"; "preferences.show-reblog-and-favorite-counts" = "הצג מספר הדהודים וחיבובים"; "preferences.status-word" = "מילת סטטוס"; +"preferences.keyboard-type" = "מקלדת"; +"preferences.keyboard-type.twitter" = "Twitter"; +"preferences.keyboard-type.default-text" = "בְּרִירַת מֶחדָל"; "filters.active" = "פעיל"; "filters.expired" = "פג תוקף"; "filter.add-new" = "הוספת מסנן חדש"; diff --git a/Localizations/ja.lproj/Localizable.strings b/Localizations/ja.lproj/Localizable.strings index e626cdad..0f0e7d80 100644 --- a/Localizations/ja.lproj/Localizable.strings +++ b/Localizations/ja.lproj/Localizable.strings @@ -253,6 +253,9 @@ "preferences.require-double-tap-to-favorite" = "ダブルタップでお気に入り"; "preferences.show-reblog-and-favorite-counts" = "ブースト・お気に入り数を表示"; "preferences.status-word" = "ステータスを表す言葉"; +"preferences.keyboard-type" = "キーボード"; +"preferences.keyboard-type.twitter" = "Twitter"; +"preferences.keyboard-type.default-text" = "デフォルト"; "filters.active" = "有効"; "filters.expired" = "期限切れ"; "filter.add-new" = "新しいフィルターを追加"; diff --git a/Localizations/ko.lproj/Localizable.strings b/Localizations/ko.lproj/Localizable.strings index 9499e82f..c112dae1 100644 --- a/Localizations/ko.lproj/Localizable.strings +++ b/Localizations/ko.lproj/Localizable.strings @@ -253,6 +253,9 @@ "preferences.require-double-tap-to-favorite" = "두 번 탭 해서 즐겨찾기"; "preferences.show-reblog-and-favorite-counts" = "부스트 및 즐겨찾기 수 표시"; "preferences.status-word" = "상태를 나타내는 말"; +"preferences.keyboard-type" = "건반"; +"preferences.keyboard-type.twitter" = "Twitter"; +"preferences.keyboard-type.default-text" = "기본"; "filters.active" = "활성화"; "filters.expired" = "만료됨"; "filter.add-new" = "새 필터 추가"; diff --git a/Localizations/pl.lproj/Localizable.strings b/Localizations/pl.lproj/Localizable.strings index cae64d46..8a5caf1a 100644 --- a/Localizations/pl.lproj/Localizable.strings +++ b/Localizations/pl.lproj/Localizable.strings @@ -253,6 +253,9 @@ "preferences.require-double-tap-to-favorite" = "Wymagaj podwójnego stuknięcia do polubienia"; "preferences.show-reblog-and-favorite-counts" = "Pokazuj licznik podbić i polubień"; "preferences.status-word" = "Używaj jako nazwy statusu"; +"preferences.keyboard-type" = "Klawiatura"; +"preferences.keyboard-type.twitter" = "Twitter"; +"preferences.keyboard-type.default-text" = "Domyślna"; "filters.active" = "Aktywny"; "filters.expired" = "Wygasły"; "filter.add-new" = "Dodaj nowy filtr"; diff --git a/Localizations/pt-BR.lproj/Localizable.strings b/Localizations/pt-BR.lproj/Localizable.strings index 58a67b43..7e8bd3ce 100644 --- a/Localizations/pt-BR.lproj/Localizable.strings +++ b/Localizations/pt-BR.lproj/Localizable.strings @@ -253,6 +253,9 @@ "preferences.require-double-tap-to-favorite" = "Solicitar toque duplo para favoritar"; "preferences.show-reblog-and-favorite-counts" = "Mostrar contagem de boosts e favoritos"; "preferences.status-word" = "Estado da palavra"; +"preferences.keyboard-type" = "Teclado"; +"preferences.keyboard-type.twitter" = "Twitter"; +"preferences.keyboard-type.default-text" = "Predefinição"; "filters.active" = "Ativo"; "filters.expired" = "Expirados"; "filter.add-new" = "Adicionar Novo Filtro"; diff --git a/Localizations/ru.lproj/Localizable.strings b/Localizations/ru.lproj/Localizable.strings index b9ab5a43..143d242b 100644 --- a/Localizations/ru.lproj/Localizable.strings +++ b/Localizations/ru.lproj/Localizable.strings @@ -253,6 +253,9 @@ "preferences.require-double-tap-to-favorite" = "Требуется двойное нажатие для добавления в избранное"; "preferences.show-reblog-and-favorite-counts" = "Показать счётчик продвижений и добавлений в избранное"; "preferences.status-word" = "Название статусов"; +"preferences.keyboard-type" = "Клавиатура"; +"preferences.keyboard-type.twitter" = "Twitter"; +"preferences.keyboard-type.default-text" = "дефолт"; "filters.active" = "Активный"; "filters.expired" = "Истёк"; "filter.add-new" = "Добавить новый фильтр"; diff --git a/Localizations/sv.lproj/Localizable.strings b/Localizations/sv.lproj/Localizable.strings index eff5dbfe..72f99177 100644 --- a/Localizations/sv.lproj/Localizable.strings +++ b/Localizations/sv.lproj/Localizable.strings @@ -253,6 +253,9 @@ "preferences.require-double-tap-to-favorite" = "Kräv dubbeltryck för att favoritmarkera"; "preferences.show-reblog-and-favorite-counts" = "Visa antal boosts och favoritmarkeringar"; "preferences.status-word" = "Statusord"; +"preferences.keyboard-type" = "Tangentbord"; +"preferences.keyboard-type.twitter" = "Twitter"; +"preferences.keyboard-type.default-text" = "Standard"; "filters.active" = "Aktiv"; "filters.expired" = "Upphört"; "filter.add-new" = "Lägg till nytt filter"; diff --git a/Localizations/zh-Hans.lproj/Localizable.strings b/Localizations/zh-Hans.lproj/Localizable.strings index f3913bc3..399fb8b8 100644 --- a/Localizations/zh-Hans.lproj/Localizable.strings +++ b/Localizations/zh-Hans.lproj/Localizable.strings @@ -253,6 +253,9 @@ "preferences.require-double-tap-to-favorite" = "需要双击才能点赞"; "preferences.show-reblog-and-favorite-counts" = "显示转发与点赞的计数"; "preferences.status-word" = "表述状态用的词"; +"preferences.keyboard-type" = "键盘"; +"preferences.keyboard-type.twitter" = "Twitter"; +"preferences.keyboard-type.default-text" = "默认"; "filters.active" = "已启用"; "filters.expired" = "已过期"; "filter.add-new" = "添加新筛选器"; diff --git a/Localizations/zh-Hant.lproj/Localizable.strings b/Localizations/zh-Hant.lproj/Localizable.strings index a573a624..3ea1fc57 100644 --- a/Localizations/zh-Hant.lproj/Localizable.strings +++ b/Localizations/zh-Hant.lproj/Localizable.strings @@ -253,6 +253,9 @@ "preferences.require-double-tap-to-favorite" = "需要點按兩次才能收藏"; "preferences.show-reblog-and-favorite-counts" = "顯示轉嘟與收藏的次數"; "preferences.status-word" = "狀態字"; +"preferences.keyboard-type" = "鍵盤"; +"preferences.keyboard-type.twitter" = "Twitter"; +"preferences.keyboard-type.default-text" = "默認"; "filters.active" = "已啟用"; "filters.expired" = "已過期"; "filter.add-new" = "新增篩選器"; diff --git a/ServiceLayer/Sources/ServiceLayer/Utilities/AppPreferences.swift b/ServiceLayer/Sources/ServiceLayer/Utilities/AppPreferences.swift index 828fa034..17e80b64 100644 --- a/ServiceLayer/Sources/ServiceLayer/Utilities/AppPreferences.swift +++ b/ServiceLayer/Sources/ServiceLayer/Utilities/AppPreferences.swift @@ -40,6 +40,13 @@ public extension AppPreferences { public var id: String { rawValue } } + enum KeyboardType: String, CaseIterable, Identifiable { + case twitter + case defaultText + + public var id: String { rawValue } + } + enum Autoplay: String, CaseIterable, Identifiable { case always case wifi @@ -91,6 +98,18 @@ public extension AppPreferences { set { self[.animateAvatars] = newValue.rawValue } } + var keyboardType: KeyboardType { + get { + if let rawValue = self[.keyboardType] as String?, + let value = KeyboardType(rawValue: rawValue) { + return value + } + + return .twitter + } + set { self[.keyboardType] = newValue.rawValue } + } + var animateHeaders: Bool { get { self[.animateHeaders] ?? !systemReduceMotion() } set { self[.animateHeaders] = newValue } @@ -210,6 +229,7 @@ private extension AppPreferences { case requireDoubleTapToReblog case requireDoubleTapToFavorite case animateAvatars + case keyboardType case animateHeaders case animateCustomEmojis case autoplayGIFs diff --git a/Views/SwiftUI/PreferencesView.swift b/Views/SwiftUI/PreferencesView.swift index 296e58d8..7d7d06d2 100644 --- a/Views/SwiftUI/PreferencesView.swift +++ b/Views/SwiftUI/PreferencesView.swift @@ -101,6 +101,12 @@ struct PreferencesView: View { Text(option.localizedStringKey).tag(option) } } + Picker("preferences.keyboard-type", + selection: $identityContext.appPreferences.keyboardType) { + ForEach(AppPreferences.KeyboardType.allCases) { option in + Text(option.localizedStringKey).tag(option) + } + } Toggle("preferences.show-reblog-and-favorite-counts", isOn: $identityContext.appPreferences.showReblogAndFavoriteCounts) Toggle("preferences.require-double-tap-to-reblog", @@ -195,6 +201,17 @@ extension AppPreferences.AnimateAvatars { } } +extension AppPreferences.KeyboardType { + var localizedStringKey: LocalizedStringKey { + switch self { + case .twitter: + return "preferences.keyboard-type.twitter" + case .defaultText: + return "preferences.keyboard-type.default-text" + } + } +} + extension AppPreferences.Autoplay { var localizedStringKey: LocalizedStringKey { switch self { diff --git a/Views/UIKit/CompositionView.swift b/Views/UIKit/CompositionView.swift index 5c0cda02..48e9179b 100644 --- a/Views/UIKit/CompositionView.swift +++ b/Views/UIKit/CompositionView.swift @@ -107,7 +107,9 @@ private extension CompositionView { autocompleteQueryPublisher: viewModel.$autocompleteQuery.eraseToAnyPublisher()) stackView.addArrangedSubview(textView) - textView.keyboardType = .twitter + textView.keyboardType = parentViewModel.identityContext.appPreferences.keyboardType == .twitter + ? .twitter + : .default textView.isScrollEnabled = false textView.adjustsFontForContentSizeCategory = true textView.font = textViewFont From 1f1939d0b0345d8b3f5aabd91c10be9fcf7dff00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Raphael=20St=C3=A4bler?= Date: Tue, 29 Nov 2022 16:05:01 +0100 Subject: [PATCH 2/2] Update localized strings for keyboard type setting --- Localizations/ca.lproj/Localizable.strings | 4 ++-- Localizations/cs.lproj/Localizable.strings | 4 ++-- Localizations/de.lproj/Localizable.strings | 4 ++-- Localizations/el.lproj/Localizable.strings | 4 ++-- Localizations/en.lproj/Localizable.strings | 4 ++-- Localizations/es.lproj/Localizable.strings | 4 ++-- Localizations/eu.lproj/Localizable.strings | 4 ++-- Localizations/fr.lproj/Localizable.strings | 4 ++-- Localizations/gd.lproj/Localizable.strings | 4 ++-- Localizations/he.lproj/Localizable.strings | 4 ++-- Localizations/ja.lproj/Localizable.strings | 4 ++-- Localizations/ko.lproj/Localizable.strings | 4 ++-- Localizations/pl.lproj/Localizable.strings | 4 ++-- Localizations/pt-BR.lproj/Localizable.strings | 2 +- Localizations/ru.lproj/Localizable.strings | 4 ++-- Localizations/sv.lproj/Localizable.strings | 2 +- Localizations/zh-Hans.lproj/Localizable.strings | 4 ++-- Localizations/zh-Hant.lproj/Localizable.strings | 4 ++-- 18 files changed, 34 insertions(+), 34 deletions(-) diff --git a/Localizations/ca.lproj/Localizable.strings b/Localizations/ca.lproj/Localizable.strings index d47f1196..e55b72ad 100644 --- a/Localizations/ca.lproj/Localizable.strings +++ b/Localizations/ca.lproj/Localizable.strings @@ -254,8 +254,8 @@ "preferences.show-reblog-and-favorite-counts" = "Mostra el recompte d’impulsos i favorits"; "preferences.status-word" = "Paraula d’estat"; "preferences.keyboard-type" = "Teclat"; -"preferences.keyboard-type.twitter" = "Twitter"; -"preferences.keyboard-type.default-text" = "Per defecte"; +"preferences.keyboard-type.twitter" = "Amb clau hash"; +"preferences.keyboard-type.default-text" = "Amb la tecla enter"; "filters.active" = "Actiu"; "filters.expired" = "Caducat"; "filter.add-new" = "Afegeix un filtre nou"; diff --git a/Localizations/cs.lproj/Localizable.strings b/Localizations/cs.lproj/Localizable.strings index 2a33ac4c..0e518857 100644 --- a/Localizations/cs.lproj/Localizable.strings +++ b/Localizations/cs.lproj/Localizable.strings @@ -254,8 +254,8 @@ "preferences.show-reblog-and-favorite-counts" = "Zobrazit boostů a počet oblíbených"; "preferences.status-word" = "Toot/Příspěvek"; "preferences.keyboard-type" = "Klávesnice"; -"preferences.keyboard-type.twitter" = "Twitter"; -"preferences.keyboard-type.default-text" = "Výchozí"; +"preferences.keyboard-type.twitter" = "S hash klíčem"; +"preferences.keyboard-type.default-text" = "S klávesou enter"; "filters.active" = "Aktivní"; "filters.expired" = "Platnost vypršela"; "filter.add-new" = "Přidat nový filtr"; diff --git a/Localizations/de.lproj/Localizable.strings b/Localizations/de.lproj/Localizable.strings index 0804c50e..57d1dd4f 100644 --- a/Localizations/de.lproj/Localizable.strings +++ b/Localizations/de.lproj/Localizable.strings @@ -254,8 +254,8 @@ "preferences.show-reblog-and-favorite-counts" = "Boosts und Favoriten anzeigen"; "preferences.status-word" = "Statuswort"; "preferences.keyboard-type" = "Tastatur"; -"preferences.keyboard-type.twitter" = "Twitter"; -"preferences.keyboard-type.default-text" = "Standard"; +"preferences.keyboard-type.twitter" = "Mit Rautetaste"; +"preferences.keyboard-type.default-text" = "Mit Eingabetaste"; "filters.active" = "Aktiv"; "filters.expired" = "Abgelaufen"; "filter.add-new" = "Neuer Filter"; diff --git a/Localizations/el.lproj/Localizable.strings b/Localizations/el.lproj/Localizable.strings index 53af6a9a..cd434260 100644 --- a/Localizations/el.lproj/Localizable.strings +++ b/Localizations/el.lproj/Localizable.strings @@ -254,8 +254,8 @@ "preferences.show-reblog-and-favorite-counts" = "Εμφάνιση μετρήσεων των boosts και αγαπημένων"; "preferences.status-word" = "Λέξη κατάστασης"; "preferences.keyboard-type" = "Πληκτρολόγιο"; -"preferences.keyboard-type.twitter" = "Twitter"; -"preferences.keyboard-type.default-text" = "Προκαθορισμένο"; +"preferences.keyboard-type.twitter" = "Με κλειδί κατακερματισμού"; +"preferences.keyboard-type.default-text" = "Με το πλήκτρο enter"; "filters.active" = "Ενεργό"; "filters.expired" = "Έληξε"; "filter.add-new" = "Προσθήκη Νέου Φίλτρου"; diff --git a/Localizations/en.lproj/Localizable.strings b/Localizations/en.lproj/Localizable.strings index f4033705..234a56cc 100644 --- a/Localizations/en.lproj/Localizable.strings +++ b/Localizations/en.lproj/Localizable.strings @@ -254,8 +254,8 @@ "preferences.show-reblog-and-favorite-counts" = "Show boost and favorite counts"; "preferences.status-word" = "Status word"; "preferences.keyboard-type" = "Keyboard"; -"preferences.keyboard-type.twitter" = "Twitter"; -"preferences.keyboard-type.default-text" = "Default"; +"preferences.keyboard-type.twitter" = "With hash key"; +"preferences.keyboard-type.default-text" = "With enter key"; "filters.active" = "Active"; "filters.expired" = "Expired"; "filter.add-new" = "Add New Filter"; diff --git a/Localizations/es.lproj/Localizable.strings b/Localizations/es.lproj/Localizable.strings index a86616fe..2a6a646d 100644 --- a/Localizations/es.lproj/Localizable.strings +++ b/Localizations/es.lproj/Localizable.strings @@ -254,8 +254,8 @@ "preferences.show-reblog-and-favorite-counts" = "Mostrar boost y cuentas favoritas"; "preferences.status-word" = "Palabra de estado"; "preferences.keyboard-type" = "Teclado"; -"preferences.keyboard-type.twitter" = "Twitter"; -"preferences.keyboard-type.default-text" = "Defecto"; +"preferences.keyboard-type.twitter" = "Con clave hash"; +"preferences.keyboard-type.default-text" = "Con tecla enter"; "filters.active" = "Activo"; "filters.expired" = "Ha caducado"; "filter.add-new" = "Añadir un filtro nuevo"; diff --git a/Localizations/eu.lproj/Localizable.strings b/Localizations/eu.lproj/Localizable.strings index dd9c757a..85e98838 100644 --- a/Localizations/eu.lproj/Localizable.strings +++ b/Localizations/eu.lproj/Localizable.strings @@ -254,8 +254,8 @@ "preferences.show-reblog-and-favorite-counts" = "Erakutsi bultzada eta gogoko kopurua"; "preferences.status-word" = "Nahiago duzun hitza"; "preferences.keyboard-type" = "Teklatua"; -"preferences.keyboard-type.twitter" = "Twitter"; -"preferences.keyboard-type.default-text" = "Lehenetsia"; +"preferences.keyboard-type.twitter" = "Hash giltzarekin"; +"preferences.keyboard-type.default-text" = "Sartu teklarekin"; "filters.active" = "Aktibo"; "filters.expired" = "Iraungita"; "filter.add-new" = "Gehitu iragazki berria"; diff --git a/Localizations/fr.lproj/Localizable.strings b/Localizations/fr.lproj/Localizable.strings index 8c6d77ae..873c48a0 100644 --- a/Localizations/fr.lproj/Localizable.strings +++ b/Localizations/fr.lproj/Localizable.strings @@ -254,8 +254,8 @@ "preferences.show-reblog-and-favorite-counts" = "Afficher le nombre de partages/favoris"; "preferences.status-word" = "Mot de statut"; "preferences.keyboard-type" = "Clavier"; -"preferences.keyboard-type.twitter" = "Twitter"; -"preferences.keyboard-type.default-text" = "Défaut"; +"preferences.keyboard-type.twitter" = "Avec clé de hachage"; +"preferences.keyboard-type.default-text" = "Avec la touche entrée"; "filters.active" = "Actifs"; "filters.expired" = "Expirés"; "filter.add-new" = "Ajouter un nouveau filtre"; diff --git a/Localizations/gd.lproj/Localizable.strings b/Localizations/gd.lproj/Localizable.strings index 3cb7e52a..caaf8554 100644 --- a/Localizations/gd.lproj/Localizable.strings +++ b/Localizations/gd.lproj/Localizable.strings @@ -254,8 +254,8 @@ "preferences.show-reblog-and-favorite-counts" = "Seall cunntas nam brosnachaidhean ’s nan annsachdan"; "preferences.status-word" = "Facal puist"; "preferences.keyboard-type" = "Meur-chlàr"; -"preferences.keyboard-type.twitter" = "Twitter"; -"preferences.keyboard-type.default-text" = "Bunaiteach"; +"preferences.keyboard-type.twitter" = "Le iuchair hash"; +"preferences.keyboard-type.default-text" = "Leis an iuchair cuir a-steach"; "filters.active" = "Gnìomhach"; "filters.expired" = "Thàinig e gu crìoch"; "filter.add-new" = "Cuir criathrag ùr ris"; diff --git a/Localizations/he.lproj/Localizable.strings b/Localizations/he.lproj/Localizable.strings index 5fa2103d..98b9966a 100644 --- a/Localizations/he.lproj/Localizable.strings +++ b/Localizations/he.lproj/Localizable.strings @@ -254,8 +254,8 @@ "preferences.show-reblog-and-favorite-counts" = "הצג מספר הדהודים וחיבובים"; "preferences.status-word" = "מילת סטטוס"; "preferences.keyboard-type" = "מקלדת"; -"preferences.keyboard-type.twitter" = "Twitter"; -"preferences.keyboard-type.default-text" = "בְּרִירַת מֶחדָל"; +"preferences.keyboard-type.twitter" = "עם מפתח hash"; +"preferences.keyboard-type.default-text" = "עם מקש אנטר"; "filters.active" = "פעיל"; "filters.expired" = "פג תוקף"; "filter.add-new" = "הוספת מסנן חדש"; diff --git a/Localizations/ja.lproj/Localizable.strings b/Localizations/ja.lproj/Localizable.strings index 0f0e7d80..2996b2c6 100644 --- a/Localizations/ja.lproj/Localizable.strings +++ b/Localizations/ja.lproj/Localizable.strings @@ -254,8 +254,8 @@ "preferences.show-reblog-and-favorite-counts" = "ブースト・お気に入り数を表示"; "preferences.status-word" = "ステータスを表す言葉"; "preferences.keyboard-type" = "キーボード"; -"preferences.keyboard-type.twitter" = "Twitter"; -"preferences.keyboard-type.default-text" = "デフォルト"; +"preferences.keyboard-type.twitter" = "ハッシュキーあり"; +"preferences.keyboard-type.default-text" = "エンターキーあり"; "filters.active" = "有効"; "filters.expired" = "期限切れ"; "filter.add-new" = "新しいフィルターを追加"; diff --git a/Localizations/ko.lproj/Localizable.strings b/Localizations/ko.lproj/Localizable.strings index c112dae1..da599175 100644 --- a/Localizations/ko.lproj/Localizable.strings +++ b/Localizations/ko.lproj/Localizable.strings @@ -254,8 +254,8 @@ "preferences.show-reblog-and-favorite-counts" = "부스트 및 즐겨찾기 수 표시"; "preferences.status-word" = "상태를 나타내는 말"; "preferences.keyboard-type" = "건반"; -"preferences.keyboard-type.twitter" = "Twitter"; -"preferences.keyboard-type.default-text" = "기본"; +"preferences.keyboard-type.twitter" = "해시 키 사용"; +"preferences.keyboard-type.default-text" = "엔터키로"; "filters.active" = "활성화"; "filters.expired" = "만료됨"; "filter.add-new" = "새 필터 추가"; diff --git a/Localizations/pl.lproj/Localizable.strings b/Localizations/pl.lproj/Localizable.strings index 8a5caf1a..7e856877 100644 --- a/Localizations/pl.lproj/Localizable.strings +++ b/Localizations/pl.lproj/Localizable.strings @@ -254,8 +254,8 @@ "preferences.show-reblog-and-favorite-counts" = "Pokazuj licznik podbić i polubień"; "preferences.status-word" = "Używaj jako nazwy statusu"; "preferences.keyboard-type" = "Klawiatura"; -"preferences.keyboard-type.twitter" = "Twitter"; -"preferences.keyboard-type.default-text" = "Domyślna"; +"preferences.keyboard-type.twitter" = "Z kluczem krzyżykowym"; +"preferences.keyboard-type.default-text" = "Z klawiszem Enter"; "filters.active" = "Aktywny"; "filters.expired" = "Wygasły"; "filter.add-new" = "Dodaj nowy filtr"; diff --git a/Localizations/pt-BR.lproj/Localizable.strings b/Localizations/pt-BR.lproj/Localizable.strings index 7e8bd3ce..686a9c9a 100644 --- a/Localizations/pt-BR.lproj/Localizable.strings +++ b/Localizations/pt-BR.lproj/Localizable.strings @@ -254,7 +254,7 @@ "preferences.show-reblog-and-favorite-counts" = "Mostrar contagem de boosts e favoritos"; "preferences.status-word" = "Estado da palavra"; "preferences.keyboard-type" = "Teclado"; -"preferences.keyboard-type.twitter" = "Twitter"; +"preferences.keyboard-type.twitter" = "Com chave hash"; "preferences.keyboard-type.default-text" = "Predefinição"; "filters.active" = "Ativo"; "filters.expired" = "Expirados"; diff --git a/Localizations/ru.lproj/Localizable.strings b/Localizations/ru.lproj/Localizable.strings index 143d242b..c4f63c20 100644 --- a/Localizations/ru.lproj/Localizable.strings +++ b/Localizations/ru.lproj/Localizable.strings @@ -254,8 +254,8 @@ "preferences.show-reblog-and-favorite-counts" = "Показать счётчик продвижений и добавлений в избранное"; "preferences.status-word" = "Название статусов"; "preferences.keyboard-type" = "Клавиатура"; -"preferences.keyboard-type.twitter" = "Twitter"; -"preferences.keyboard-type.default-text" = "дефолт"; +"preferences.keyboard-type.twitter" = "С хэш-ключом"; +"preferences.keyboard-type.default-text" = "С клавишей ввода"; "filters.active" = "Активный"; "filters.expired" = "Истёк"; "filter.add-new" = "Добавить новый фильтр"; diff --git a/Localizations/sv.lproj/Localizable.strings b/Localizations/sv.lproj/Localizable.strings index 72f99177..3046c576 100644 --- a/Localizations/sv.lproj/Localizable.strings +++ b/Localizations/sv.lproj/Localizable.strings @@ -254,7 +254,7 @@ "preferences.show-reblog-and-favorite-counts" = "Visa antal boosts och favoritmarkeringar"; "preferences.status-word" = "Statusord"; "preferences.keyboard-type" = "Tangentbord"; -"preferences.keyboard-type.twitter" = "Twitter"; +"preferences.keyboard-type.twitter" = "Med hash-nyckel"; "preferences.keyboard-type.default-text" = "Standard"; "filters.active" = "Aktiv"; "filters.expired" = "Upphört"; diff --git a/Localizations/zh-Hans.lproj/Localizable.strings b/Localizations/zh-Hans.lproj/Localizable.strings index 399fb8b8..c289d3c7 100644 --- a/Localizations/zh-Hans.lproj/Localizable.strings +++ b/Localizations/zh-Hans.lproj/Localizable.strings @@ -254,8 +254,8 @@ "preferences.show-reblog-and-favorite-counts" = "显示转发与点赞的计数"; "preferences.status-word" = "表述状态用的词"; "preferences.keyboard-type" = "键盘"; -"preferences.keyboard-type.twitter" = "Twitter"; -"preferences.keyboard-type.default-text" = "默认"; +"preferences.keyboard-type.twitter" = "带散列键"; +"preferences.keyboard-type.default-text" = "用回车键"; "filters.active" = "已启用"; "filters.expired" = "已过期"; "filter.add-new" = "添加新筛选器"; diff --git a/Localizations/zh-Hant.lproj/Localizable.strings b/Localizations/zh-Hant.lproj/Localizable.strings index 3ea1fc57..751cdba6 100644 --- a/Localizations/zh-Hant.lproj/Localizable.strings +++ b/Localizations/zh-Hant.lproj/Localizable.strings @@ -254,8 +254,8 @@ "preferences.show-reblog-and-favorite-counts" = "顯示轉嘟與收藏的次數"; "preferences.status-word" = "狀態字"; "preferences.keyboard-type" = "鍵盤"; -"preferences.keyboard-type.twitter" = "Twitter"; -"preferences.keyboard-type.default-text" = "默認"; +"preferences.keyboard-type.twitter" = "使用哈希鍵"; +"preferences.keyboard-type.default-text" = "用回車鍵"; "filters.active" = "已啟用"; "filters.expired" = "已過期"; "filter.add-new" = "新增篩選器";