diff --git a/IceCubesApp/App/Tabs/Settings/SwipeActionsSettingsView.swift b/IceCubesApp/App/Tabs/Settings/SwipeActionsSettingsView.swift index e6895e6c..d1196519 100644 --- a/IceCubesApp/App/Tabs/Settings/SwipeActionsSettingsView.swift +++ b/IceCubesApp/App/Tabs/Settings/SwipeActionsSettingsView.swift @@ -8,65 +8,58 @@ struct SwipeActionsSettingsView: View { var body: some View { Form { - Section("settings.swipeactions.status") { - Label("settings.swipeactions.status.leading", systemImage: "arrow.right.circle") - Picker(selection: $userPreferences.swipeActionsStatusLeadingLeft, label: makeSwipeLabel(left: true, text: "settings.swipeactions.status.leading.left")) { - Section { - Text(StatusAction.none.displayName()).tag(StatusAction.none) - } - Section { - ForEach(StatusAction.allCases) { action in - if action != .none { - Text(action.displayName()).tag(action) - } + Section { + + Label("settings.swipeactions.status.leading", systemImage: "arrow.right") + .foregroundColor(.secondary) + + createStatusActionPicker(selection: $userPreferences.swipeActionsStatusLeadingLeft, + label: "settings.swipeactions.primary") + .onChange(of: userPreferences.swipeActionsStatusLeadingLeft) { action in + if action == .none { + userPreferences.swipeActionsStatusLeadingRight = .none; } } - } - Picker(selection: $userPreferences.swipeActionsStatusLeadingRight, label: makeSwipeLabel(left: false, text: "settings.swipeactions.status.leading.right")) { - Section { - Text(StatusAction.none.displayName()).tag(StatusAction.none) - } - Section { - ForEach(StatusAction.allCases) { action in - if action != .none { - Text(action.displayName()).tag(action) - } + + createStatusActionPicker(selection: $userPreferences.swipeActionsStatusLeadingRight, + label: "settings.swipeactions.secondary") + .disabled(userPreferences.swipeActionsStatusLeadingLeft == .none) + + Label("settings.swipeactions.status.trailing", systemImage: "arrow.left") + .foregroundColor(.secondary) + + createStatusActionPicker(selection: $userPreferences.swipeActionsStatusTrailingRight, + label: "settings.swipeactions.primary") + .onChange(of: userPreferences.swipeActionsStatusTrailingRight) { action in + if action == .none { + userPreferences.swipeActionsStatusTrailingLeft = .none; } } - } - Label("settings.swipeactions.status.trailing", systemImage: "arrow.left.circle") - Picker(selection: $userPreferences.swipeActionsStatusTrailingLeft, label: makeSwipeLabel(left: true, text: "settings.swipeactions.status.trailing.left")) { - Section { - Text(StatusAction.none.displayName()).tag(StatusAction.none) - } - Section { - ForEach(StatusAction.allCases) { action in - if action != .none { - Text(action.displayName()).tag(action) - } - } - } - } - Picker(selection: $userPreferences.swipeActionsStatusTrailingRight, label: makeSwipeLabel(left: false, text: "settings.swipeactions.status.trailing.right")) { - Section { - Text(StatusAction.none.displayName()).tag(StatusAction.none) - } - Section { - ForEach(StatusAction.allCases) { action in - if action != .none { - Text(action.displayName()).tag(action) - } - } - } - } - Toggle(isOn: $userPreferences.swipeActionsUseThemeColor) { - Label("settings.swipeactions.status.use-theme-colors", systemImage: "paintbrush.pointed") - } - Picker(selection: $userPreferences.swipeActionsIconStyle, label: Label("settings.swipeactions.status.icon-style", systemImage: "text.below.photo")) { + + createStatusActionPicker(selection: $userPreferences.swipeActionsStatusTrailingLeft, + label: "settings.swipeactions.secondary") + .disabled(userPreferences.swipeActionsStatusTrailingRight == .none) + + } header: { + Text("settings.swipeactions.status") + } footer: { + Text("settings.swipeactions.status.explanation") + } + .listRowBackground(theme.primaryBackgroundColor) + + Section { + Picker(selection: $userPreferences.swipeActionsIconStyle, label: Text("settings.swipeactions.icon-style")) { ForEach(UserPreferences.SwipeActionsIconStyle.allCases, id: \.rawValue) { style in Text(style.description).tag(style) } } + Toggle(isOn: $userPreferences.swipeActionsUseThemeColor) { + Text("settings.swipeactions.use-theme-colors") + } + } header: { + Text("settings.swipeactions.appearance") + } footer: { + Text("settings.swipeactions.use-theme-colors-explanation") } .listRowBackground(theme.primaryBackgroundColor) } @@ -75,8 +68,19 @@ struct SwipeActionsSettingsView: View { .background(theme.secondaryBackgroundColor) } - private func makeSwipeLabel(left: Bool, text: LocalizedStringKey) -> some View { - return Label(text, systemImage: left ? "rectangle.lefthalf.filled" : "rectangle.righthalf.filled") - .padding(.leading, 16) + private func createStatusActionPicker(selection: Binding, label: LocalizedStringKey) -> some View { + return Picker(selection: selection, label: Text(label)) { + Section { + Text(StatusAction.none.displayName()).tag(StatusAction.none) + } + Section { + ForEach(StatusAction.allCases) { action in + if action != .none { + Text(action.displayName()).tag(action) + } + } + } + } } + } diff --git a/IceCubesApp/Resources/Localization/be.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/be.lproj/Localizable.strings index accadb61..a9fc6e60 100644 --- a/IceCubesApp/Resources/Localization/be.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/be.lproj/Localizable.strings @@ -171,19 +171,24 @@ "settings.general.swipeactions" = "Дзеянні правядзення пальцам"; "settings.swipeactions.navigation-title" = "Дзеянні правядзення пальцам"; +"settings.swipeactions.primary" = "Primary Action"; +"settings.swipeactions.secondary" = "Secondary Action"; "settings.swipeactions.status.action.bookmark" = "Закладка"; "settings.swipeactions.status.action.boost" = "Павышэнне"; "settings.swipeactions.status.action.favorite" = "У ўлюбёныя"; "settings.swipeactions.status.action.none" = "Нічога"; "settings.swipeactions.status.action.quote" = "Цытаваць"; "settings.swipeactions.status.action.reply" = "Адказаць"; +"settings.swipeactions.status.explanation" = "Swipe actions are available upon swiping left or right on a post. The secondary action is only available if the primary action is set."; "settings.swipeactions.status.leading" = "Правядзіце ўправа"; -"settings.swipeactions.status.leading.left" = "злева"; -"settings.swipeactions.status.leading.right" = "справа"; "settings.swipeactions.status.trailing" = "Правядзіце ўлева"; -"settings.swipeactions.status.trailing.left" = "злева"; -"settings.swipeactions.status.trailing.right" = "справа"; "settings.swipeactions.status" = "Допіс"; + +"settings.swipeactions.appearance" = "Appearance"; +"settings.swipeactions.use-theme-colors" = "Use Theme Colors"; +"settings.swipeactions.use-theme-colors-explanation" = "Use theme colors instead of default colors"; +"settings.swipeactions.icon-style" = "Icon Style"; + "settings.swipeactions.status.use-theme-colors" = "Выкарыстоўваць колеры тэмы замест колераў па змаўчанні"; "settings.swipeactions.status.icon-style" = "Стылі значкоў"; diff --git a/IceCubesApp/Resources/Localization/ca.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/ca.lproj/Localizable.strings index 771adff4..54c2c917 100644 --- a/IceCubesApp/Resources/Localization/ca.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/ca.lproj/Localizable.strings @@ -169,21 +169,22 @@ "settings.general.swipeactions" = "Swipe Actions"; "settings.swipeactions.navigation-title" = "Swipe Actions"; +"settings.swipeactions.primary" = "Primary Action"; +"settings.swipeactions.secondary" = "Secondary Action"; "settings.swipeactions.status.action.bookmark" = "Bookmark"; "settings.swipeactions.status.action.boost" = "Boost"; "settings.swipeactions.status.action.favorite" = "Favorite"; "settings.swipeactions.status.action.none" = "None"; "settings.swipeactions.status.action.quote" = "Quote"; "settings.swipeactions.status.action.reply" = "Reply"; +"settings.swipeactions.status.explanation" = "Swipe actions are available upon swiping left or right on a post. The secondary action is only available if the primary action is set."; "settings.swipeactions.status.leading" = "Swipe right"; -"settings.swipeactions.status.leading.left" = "left"; -"settings.swipeactions.status.leading.right" = "right"; "settings.swipeactions.status.trailing" = "Swipe left"; -"settings.swipeactions.status.trailing.left" = "left"; -"settings.swipeactions.status.trailing.right" = "right"; "settings.swipeactions.status" = "Post"; -"settings.swipeactions.status.use-theme-colors" = "Use theme colors instead of default colors"; -"settings.swipeactions.status.icon-style" = "Icon style"; +"settings.swipeactions.appearance" = "Appearance"; +"settings.swipeactions.use-theme-colors" = "Use Theme Colors"; +"settings.swipeactions.use-theme-colors-explanation" = "Use theme colors instead of default colors"; +"settings.swipeactions.icon-style" = "Icon style"; "settings.display.section.font" = "Font"; diff --git a/IceCubesApp/Resources/Localization/de.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/de.lproj/Localizable.strings index e0a31678..15e24ec2 100644 --- a/IceCubesApp/Resources/Localization/de.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/de.lproj/Localizable.strings @@ -166,22 +166,23 @@ "settings.display.show-ipad-column" = "Zweite Spalte aktivieren"; "settings.general.swipeactions" = "Wischaktionen"; +"settings.swipeactions.appearance" = "Appearance"; "settings.swipeactions.navigation-title" = "Wischaktionen"; +"settings.swipeactions.primary" = "Primary Action"; +"settings.swipeactions.secondary" = "Secondary Action"; "settings.swipeactions.status.action.bookmark" = "Lesezeichen setzen"; "settings.swipeactions.status.action.boost" = "Boosten"; "settings.swipeactions.status.action.favorite" = "Favorisieren"; "settings.swipeactions.status.action.none" = "Keine"; "settings.swipeactions.status.action.quote" = "Zitieren"; "settings.swipeactions.status.action.reply" = "Antworten"; +"settings.swipeactions.status.explanation" = "Swipe actions are available upon swiping left or right on a post. The secondary action is only available if the primary action is set."; "settings.swipeactions.status.leading" = "Nach rechts wischen"; -"settings.swipeactions.status.leading.left" = "links"; -"settings.swipeactions.status.leading.right" = "rechts"; "settings.swipeactions.status.trailing" = "Nach links wischen"; -"settings.swipeactions.status.trailing.left" = "links"; -"settings.swipeactions.status.trailing.right" = "rechts"; "settings.swipeactions.status" = "Beitrag"; -"settings.swipeactions.status.use-theme-colors" = "Farbschema anstelle der Standardfarben verwenden"; -"settings.swipeactions.status.icon-style" = "Symbolstil"; +"settings.swipeactions.use-theme-colors" = "Use Theme Colors"; +"settings.swipeactions.use-theme-colors-explanation" = "Farbschema anstelle der Standardfarben verwenden"; +"settings.swipeactions.icon-style" = "Symbolstil"; "settings.display.section.font" = "Schriftart"; diff --git a/IceCubesApp/Resources/Localization/en-GB.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/en-GB.lproj/Localizable.strings index 3fa75035..7b36c160 100644 --- a/IceCubesApp/Resources/Localization/en-GB.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/en-GB.lproj/Localizable.strings @@ -173,21 +173,22 @@ "settings.general.swipeactions" = "Swipe Actions"; "settings.swipeactions.navigation-title" = "Swipe Actions"; +"settings.swipeactions.primary" = "Primary Action"; +"settings.swipeactions.secondary" = "Secondary Action"; "settings.swipeactions.status.action.bookmark" = "Bookmark"; "settings.swipeactions.status.action.boost" = "Boost"; "settings.swipeactions.status.action.favorite" = "Favorite"; "settings.swipeactions.status.action.none" = "None"; "settings.swipeactions.status.action.quote" = "Quote"; "settings.swipeactions.status.action.reply" = "Reply"; -"settings.swipeactions.status.leading" = "Swipe right"; -"settings.swipeactions.status.leading.left" = "left"; -"settings.swipeactions.status.leading.right" = "right"; -"settings.swipeactions.status.trailing" = "Swipe left"; -"settings.swipeactions.status.trailing.left" = "left"; -"settings.swipeactions.status.trailing.right" = "right"; +"settings.swipeactions.status.explanation" = "Swipe actions are available upon swiping left or right on a post. The secondary action is only available if the primary action is set."; +"settings.swipeactions.status.leading" = "Swipe Right"; +"settings.swipeactions.status.trailing" = "Swipe Left"; "settings.swipeactions.status" = "Post"; -"settings.swipeactions.status.use-theme-colors" = "Use theme colors instead of default colors"; -"settings.swipeactions.status.icon-style" = "Icon style"; +"settings.swipeactions.appearance" = "Appearance"; +"settings.swipeactions.use-theme-colors" = "Use Theme Colours"; +"settings.swipeactions.use-theme-colors-explanation" = "Use theme colours instead of default colours"; +"settings.swipeactions.icon-style" = "Icon Style"; "settings.display.section.font" = "Font"; diff --git a/IceCubesApp/Resources/Localization/en.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/en.lproj/Localizable.strings index 412acf43..781a3c3f 100644 --- a/IceCubesApp/Resources/Localization/en.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/en.lproj/Localizable.strings @@ -170,22 +170,23 @@ "settings.display.show-ipad-column" = "Enable secondary column"; "settings.general.swipeactions" = "Swipe Actions"; +"settings.swipeactions.appearance" = "Appearance"; "settings.swipeactions.navigation-title" = "Swipe Actions"; +"settings.swipeactions.primary" = "Primary Action"; +"settings.swipeactions.secondary" = "Secondary Action"; +"settings.swipeactions.status" = "Post"; "settings.swipeactions.status.action.bookmark" = "Bookmark"; "settings.swipeactions.status.action.boost" = "Boost"; "settings.swipeactions.status.action.favorite" = "Favorite"; "settings.swipeactions.status.action.none" = "None"; "settings.swipeactions.status.action.quote" = "Quote"; "settings.swipeactions.status.action.reply" = "Reply"; -"settings.swipeactions.status.leading" = "Swipe right"; -"settings.swipeactions.status.leading.left" = "left"; -"settings.swipeactions.status.leading.right" = "right"; -"settings.swipeactions.status.trailing" = "Swipe left"; -"settings.swipeactions.status.trailing.left" = "left"; -"settings.swipeactions.status.trailing.right" = "right"; -"settings.swipeactions.status" = "Post"; -"settings.swipeactions.status.use-theme-colors" = "Use theme colors instead of default colors"; -"settings.swipeactions.status.icon-style" = "Icon style"; +"settings.swipeactions.status.explanation" = "Swipe actions are available upon swiping left or right on a post. The secondary action is only available if the primary action is set."; +"settings.swipeactions.status.leading" = "Swipe Right"; +"settings.swipeactions.status.trailing" = "Swipe Left"; +"settings.swipeactions.use-theme-colors" = "Use Theme Colors"; +"settings.swipeactions.use-theme-colors-explanation" = "Use theme colors instead of default colors"; +"settings.swipeactions.icon-style" = "Icon Style"; "settings.display.section.font" = "Font"; diff --git a/IceCubesApp/Resources/Localization/es.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/es.lproj/Localizable.strings index 8391b9f6..2bfae111 100644 --- a/IceCubesApp/Resources/Localization/es.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/es.lproj/Localizable.strings @@ -167,21 +167,22 @@ "settings.general.swipeactions" = "Acciones al deslizar"; "settings.swipeactions.navigation-title" = "Acciones al deslizar"; +"settings.swipeactions.primary" = "Primary Action"; +"settings.swipeactions.secondary" = "Secondary Action"; "settings.swipeactions.status.action.bookmark" = "Marcadores"; "settings.swipeactions.status.action.boost" = "Retootear"; "settings.swipeactions.status.action.favorite" = "Favorito"; "settings.swipeactions.status.action.none" = "Ninguna"; "settings.swipeactions.status.action.quote" = "Citar"; "settings.swipeactions.status.action.reply" = "Responder"; +"settings.swipeactions.status.explanation" = "Swipe actions are available upon swiping left or right on a post. The secondary action is only available if the primary action is set."; "settings.swipeactions.status.leading" = "Deslizar a la derecha"; -"settings.swipeactions.status.leading.left" = "izquierda"; -"settings.swipeactions.status.leading.right" = "derecha"; "settings.swipeactions.status.trailing" = "Deslizar a la izquierda"; -"settings.swipeactions.status.trailing.left" = "izquierda"; -"settings.swipeactions.status.trailing.right" = "derecha"; "settings.swipeactions.status" = "Publicación"; -"settings.swipeactions.status.use-theme-colors" = "Usar colores del tema en lugar de los colores por defecto"; -"settings.swipeactions.status.icon-style" = "Estilo de icono"; +"settings.swipeactions.appearance" = "Appearance"; +"settings.swipeactions.use-theme-colors" = "Use Theme Colors"; +"settings.swipeactions.use-theme-colors-explanation" = "Usar colores del tema en lugar de los colores por defecto"; +"settings.swipeactions.icon-style" = "Estilo de icono"; "settings.display.section.font" = "Fuente"; diff --git a/IceCubesApp/Resources/Localization/eu.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/eu.lproj/Localizable.strings index adf41f34..6400bdb3 100644 --- a/IceCubesApp/Resources/Localization/eu.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/eu.lproj/Localizable.strings @@ -167,21 +167,22 @@ "settings.general.swipeactions" = "Mugimenduen ekintzak"; "settings.swipeactions.navigation-title" = "Atzamar-mugimenduen ekintzak"; +"settings.swipeactions.primary" = "Primary Action"; +"settings.swipeactions.secondary" = "Secondary Action"; "settings.swipeactions.status.action.bookmark" = "Laster-marka"; "settings.swipeactions.status.action.boost" = "Bultzatu"; "settings.swipeactions.status.action.favorite" = "Gogokoa"; "settings.swipeactions.status.action.none" = "Ezer ez"; "settings.swipeactions.status.action.quote" = "Aipatu bidalketa"; "settings.swipeactions.status.action.reply" = "Erantzun"; +"settings.swipeactions.status.explanation" = "Swipe actions are available upon swiping left or right on a post. The secondary action is only available if the primary action is set."; "settings.swipeactions.status.leading" = "Eskumarantz"; -"settings.swipeactions.status.leading.left" = "ezkerra"; -"settings.swipeactions.status.leading.right" = "eskuma"; "settings.swipeactions.status.trailing" = "Ezkerrerantz"; -"settings.swipeactions.status.trailing.left" = "ezkerra"; -"settings.swipeactions.status.trailing.right" = "eskuma"; "settings.swipeactions.status" = "Bidalketa"; -"settings.swipeactions.status.use-theme-colors" = "Erabili hautatutako kolorea defektuzko koloreen ordez"; -"settings.swipeactions.status.icon-style" = "Ikonoen itxura"; +"settings.swipeactions.appearance" = "Appearance"; +"settings.swipeactions.use-theme-colors" = "Use Theme Colors"; +"settings.swipeactions.use-theme-colors-explanation" = "Erabili hautatutako kolorea defektuzko koloreen ordez"; +"settings.swipeactions.icon-style" = "Ikonoen itxura"; "settings.display.section.font" = "Letra-tipoa"; diff --git a/IceCubesApp/Resources/Localization/fr.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/fr.lproj/Localizable.strings index fc8b0191..a49b1251 100644 --- a/IceCubesApp/Resources/Localization/fr.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/fr.lproj/Localizable.strings @@ -170,21 +170,22 @@ "settings.general.swipeactions" = "Actions de balayage"; "settings.swipeactions.navigation-title" = "Actions de balayage"; +"settings.swipeactions.primary" = "Primary Action"; +"settings.swipeactions.secondary" = "Secondary Action"; "settings.swipeactions.status.action.bookmark" = "Signet"; "settings.swipeactions.status.action.boost" = "Boost"; "settings.swipeactions.status.action.favorite" = "Favori"; "settings.swipeactions.status.action.none" = "Aucun"; "settings.swipeactions.status.action.quote" = "Citer"; "settings.swipeactions.status.action.reply" = "Répondre"; +"settings.swipeactions.status.explanation" = "Swipe actions are available upon swiping left or right on a post. The secondary action is only available if the primary action is set."; "settings.swipeactions.status.leading" = "Balayer vers la droite"; -"settings.swipeactions.status.leading.left" = "gauche"; -"settings.swipeactions.status.leading.right" = "droite"; "settings.swipeactions.status.trailing" = "Balayer vers la gauche"; -"settings.swipeactions.status.trailing.left" = "gauche"; -"settings.swipeactions.status.trailing.right" = "droite"; "settings.swipeactions.status" = "Publier"; -"settings.swipeactions.status.use-theme-colors" = "Utiliser les couleurs du thème au lieu des couleurs par défaut"; -"settings.swipeactions.status.icon-style" = "Style de l'icône"; +"settings.swipeactions.appearance" = "Appearance"; +"settings.swipeactions.use-theme-colors" = "Use Theme Colors"; +"settings.swipeactions.use-theme-colors-explanation" = "Utiliser les couleurs du thème au lieu des couleurs par défaut"; +"settings.swipeactions.icon-style" = "Style de l'icône"; "settings.display.section.font" = "Police"; diff --git a/IceCubesApp/Resources/Localization/it.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/it.lproj/Localizable.strings index 531eac62..faab2da3 100644 --- a/IceCubesApp/Resources/Localization/it.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/it.lproj/Localizable.strings @@ -170,21 +170,22 @@ "settings.general.swipeactions" = "Azioni di scorrimento"; "settings.swipeactions.navigation-title" = "Azioni di scorrimento"; +"settings.swipeactions.primary" = "Primary Action"; +"settings.swipeactions.secondary" = "Secondary Action"; "settings.swipeactions.status.action.bookmark" = "Segnalibro"; "settings.swipeactions.status.action.boost" = "Condividi"; "settings.swipeactions.status.action.favorite" = "Preferito"; "settings.swipeactions.status.action.none" = "Niente"; "settings.swipeactions.status.action.quote" = "Cita"; "settings.swipeactions.status.action.reply" = "Rispondi"; +"settings.swipeactions.status.explanation" = "Swipe actions are available upon swiping left or right on a post. The secondary action is only available if the primary action is set."; "settings.swipeactions.status.leading" = "Scorrimento a destra"; -"settings.swipeactions.status.leading.left" = "sinistra"; -"settings.swipeactions.status.leading.right" = "destra"; "settings.swipeactions.status.trailing" = "Scorrimento a sinistra"; -"settings.swipeactions.status.trailing.left" = "sinistra"; -"settings.swipeactions.status.trailing.right" = "destra"; "settings.swipeactions.status" = "Post"; -"settings.swipeactions.status.use-theme-colors" = "Usa i colori del tema al posto dei colori di default"; -"settings.swipeactions.status.icon-style" = "Stile delle icone"; +"settings.swipeactions.appearance" = "Appearance"; +"settings.swipeactions.use-theme-colors" = "Use Theme Colors"; +"settings.swipeactions.use-theme-colors-explanation" = "Usa i colori del tema al posto dei colori di default"; +"settings.swipeactions.icon-style" = "Stile delle icone"; "settings.display.section.font" = "Font"; diff --git a/IceCubesApp/Resources/Localization/ja.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/ja.lproj/Localizable.strings index cdc4e86f..c093ccae 100644 --- a/IceCubesApp/Resources/Localization/ja.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/ja.lproj/Localizable.strings @@ -169,22 +169,23 @@ "settings.display.show-ipad-column" = "セカンドカラムを有効にする"; "settings.general.swipeactions" = "スワイプ操作"; +"settings.swipeactions.appearance" = "Appearance"; "settings.swipeactions.navigation-title" = "スワイプ操作"; +"settings.swipeactions.primary" = "Primary Action"; +"settings.swipeactions.secondary" = "Secondary Action"; "settings.swipeactions.status.action.bookmark" = "ブックマーク"; "settings.swipeactions.status.action.boost" = "ブースト"; "settings.swipeactions.status.action.favorite" = "お気に入り"; "settings.swipeactions.status.action.none" = "未定義"; "settings.swipeactions.status.action.quote" = "引用"; "settings.swipeactions.status.action.reply" = "返信"; +"settings.swipeactions.status.explanation" = "Swipe actions are available upon swiping left or right on a post. The secondary action is only available if the primary action is set."; "settings.swipeactions.status.leading" = "右にスワイプ"; -"settings.swipeactions.status.leading.left" = "左欄"; -"settings.swipeactions.status.leading.right" = "右欄"; "settings.swipeactions.status.trailing" = "左にスワイプ"; -"settings.swipeactions.status.trailing.left" = "左欄"; -"settings.swipeactions.status.trailing.right" = "右欄"; "settings.swipeactions.status" = "投稿"; -"settings.swipeactions.status.use-theme-colors" = "デフォルトの色の代わりにテーマの色を使用する"; -"settings.swipeactions.status.icon-style" = "アイコンスタイル"; +"settings.swipeactions.use-theme-colors" = "Use Theme Colors"; +"settings.swipeactions.use-theme-colors-explanation" = "デフォルトの色の代わりにテーマの色を使用する"; +"settings.swipeactions.icon-style" = "アイコンスタイル"; "settings.display.section.font" = "フォント"; diff --git a/IceCubesApp/Resources/Localization/ko.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/ko.lproj/Localizable.strings index 965b57a7..48e6a627 100644 --- a/IceCubesApp/Resources/Localization/ko.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/ko.lproj/Localizable.strings @@ -170,21 +170,22 @@ "settings.general.swipeactions" = "쓸어넘기기 동작 설정"; "settings.swipeactions.navigation-title" = "쓸어넘기기 동작 설정"; +"settings.swipeactions.primary" = "Primary Action"; +"settings.swipeactions.secondary" = "Secondary Action"; "settings.swipeactions.status.action.bookmark" = "보관함에 추가"; "settings.swipeactions.status.action.boost" = "부스트"; "settings.swipeactions.status.action.favorite" = "좋아요"; "settings.swipeactions.status.action.none" = "설정 안 함"; "settings.swipeactions.status.action.quote" = "인용"; "settings.swipeactions.status.action.reply" = "댓글"; +"settings.swipeactions.status.explanation" = "Swipe actions are available upon swiping left or right on a post. The secondary action is only available if the primary action is set."; "settings.swipeactions.status.leading" = "오른쪽으로 쓸어넘길 때"; -"settings.swipeactions.status.leading.left" = "왼쪽 버튼"; -"settings.swipeactions.status.leading.right" = "오른쪽 버튼"; "settings.swipeactions.status.trailing" = "왼쪽으로 쓸어넘길 때"; -"settings.swipeactions.status.trailing.left" = "왼쪽 버튼"; -"settings.swipeactions.status.trailing.right" = "오른쪽 버튼"; "settings.swipeactions.status" = "글"; -"settings.swipeactions.status.use-theme-colors" = "기본 색상 대신 테마 색상 사용"; -"settings.swipeactions.status.icon-style" = "아이콘 모양"; +"settings.swipeactions.appearance" = "Appearance"; +"settings.swipeactions.use-theme-colors" = "Use Theme Colors"; +"settings.swipeactions.use-theme-colors-explanation" = "기본 색상 대신 테마 색상 사용"; +"settings.swipeactions.icon-style" = "아이콘 모양"; "settings.display.section.font" = "글꼴"; diff --git a/IceCubesApp/Resources/Localization/nb.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/nb.lproj/Localizable.strings index dfce0c26..fe8bf104 100644 --- a/IceCubesApp/Resources/Localization/nb.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/nb.lproj/Localizable.strings @@ -170,21 +170,22 @@ "settings.general.swipeactions" = "Swipe Actions"; "settings.swipeactions.navigation-title" = "Swipe Actions"; +"settings.swipeactions.primary" = "Primary Action"; +"settings.swipeactions.secondary" = "Secondary Action"; "settings.swipeactions.status.action.bookmark" = "Bookmark"; "settings.swipeactions.status.action.boost" = "Boost"; "settings.swipeactions.status.action.favorite" = "Favorite"; "settings.swipeactions.status.action.none" = "None"; "settings.swipeactions.status.action.quote" = "Quote"; "settings.swipeactions.status.action.reply" = "Reply"; -"settings.swipeactions.status.leading" = "Swipe right"; -"settings.swipeactions.status.leading.left" = "left"; -"settings.swipeactions.status.leading.right" = "right"; -"settings.swipeactions.status.trailing" = "Swipe left"; -"settings.swipeactions.status.trailing.left" = "left"; -"settings.swipeactions.status.trailing.right" = "right"; +"settings.swipeactions.status.explanation" = "Swipe actions are available upon swiping left or right on a post. The secondary action is only available if the primary action is set."; +"settings.swipeactions.status.leading" = "Swipe Right"; +"settings.swipeactions.status.trailing" = "Swipe Left"; "settings.swipeactions.status" = "Post"; -"settings.swipeactions.status.use-theme-colors" = "Use theme colors instead of default colors"; -"settings.swipeactions.status.icon-style" = "Icon style"; +"settings.swipeactions.appearance" = "Appearance"; +"settings.swipeactions.use-theme-colors" = "Use Theme Colors"; +"settings.swipeactions.use-theme-colors-explanation" = "Use theme colors instead of default colors"; +"settings.swipeactions.icon-style" = "Icon Style"; "settings.display.section.font" = "Font"; diff --git a/IceCubesApp/Resources/Localization/nl.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/nl.lproj/Localizable.strings index e8caea0a..a0859d98 100644 --- a/IceCubesApp/Resources/Localization/nl.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/nl.lproj/Localizable.strings @@ -166,22 +166,24 @@ "settings.display.show-ipad-column" = "Toon tweede kolom"; "settings.general.swipeactions" = "Veegacties"; +"settings.swipeactions.appearance" = "Appearance"; "settings.swipeactions.navigation-title" = "Veegacties"; -"settings.swipeactions.status.action.bookmark" = "Bookmark"; +"settings.swipeactions.primary" = "Primaire actie"; +"settings.swipeactions.secondary" = "Secundaire actie"; +"settings.swipeactions.status.action.bookmark" = "Bladwijzer"; "settings.swipeactions.status.action.boost" = "Boost"; "settings.swipeactions.status.action.favorite" = "Favoriet"; "settings.swipeactions.status.action.none" = "Geen"; "settings.swipeactions.status.action.quote" = "Citaat"; "settings.swipeactions.status.action.reply" = "Antwoord"; +"settings.swipeactions.status.explanation" = "Veeg naar links of rechts op een post om de veegacties zichtbaar te maken. De secundaire actie is alleen beschikbaar indien de primaire actie is ingesteld."; "settings.swipeactions.status.leading" = "Veeg naar rechts"; -"settings.swipeactions.status.leading.left" = "links"; -"settings.swipeactions.status.leading.right" = "rechts"; "settings.swipeactions.status.trailing" = "Veeg naar links"; -"settings.swipeactions.status.trailing.left" = "links"; -"settings.swipeactions.status.trailing.right" = "rechts"; "settings.swipeactions.status" = "Post"; -"settings.swipeactions.status.use-theme-colors" = "Gebruik themakleuren in plaats van standaardkleuren"; -"settings.swipeactions.status.icon-style" = "Symboolstijl"; +"settings.swipeactions.appearance" = "Uiterlijk"; +"settings.swipeactions.use-theme-colors" = "Gebruik themakleuren"; +"settings.swipeactions.use-theme-colors-explanation" = "Gebruik themakleuren in plaats van standaardkleuren"; +"settings.swipeactions.icon-style" = "Symboolstijl"; "settings.display.section.font" = "Lettertype"; diff --git a/IceCubesApp/Resources/Localization/pl.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/pl.lproj/Localizable.strings index 99e060d6..baeacc77 100644 --- a/IceCubesApp/Resources/Localization/pl.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/pl.lproj/Localizable.strings @@ -170,21 +170,22 @@ "settings.general.swipeactions" = "Przeciąganie palcem"; "settings.swipeactions.navigation-title" = "Przeciąganie palcem"; +"settings.swipeactions.primary" = "Primary Action"; +"settings.swipeactions.secondary" = "Secondary Action"; "settings.swipeactions.status.action.bookmark" = "Dodaj zakładkę"; "settings.swipeactions.status.action.boost" = "Podbij"; "settings.swipeactions.status.action.favorite" = "Polub"; "settings.swipeactions.status.action.none" = "Bez akcji"; "settings.swipeactions.status.action.quote" = "Zacytuj"; "settings.swipeactions.status.action.reply" = "Odpowiedz"; +"settings.swipeactions.status.explanation" = "Swipe actions are available upon swiping left or right on a post. The secondary action is only available if the primary action is set."; "settings.swipeactions.status.leading" = "Przeciągnij w prawo"; -"settings.swipeactions.status.leading.left" = "lewa"; -"settings.swipeactions.status.leading.right" = "prawa"; "settings.swipeactions.status.trailing" = "Przeciągnij w lewo"; -"settings.swipeactions.status.trailing.left" = "lewa"; -"settings.swipeactions.status.trailing.right" = "prawa"; "settings.swipeactions.status" = "Post"; -"settings.swipeactions.status.use-theme-colors" = "Używaj kolorów motywu zamiast kolorów domyślnych"; -"settings.swipeactions.status.icon-style" = "Styl ikony"; +"settings.swipeactions.appearance" = "Appearance"; +"settings.swipeactions.use-theme-colors" = "Use Theme Colors"; +"settings.swipeactions.use-theme-colors-explanation" = "Używaj kolorów motywu zamiast kolorów domyślnych"; +"settings.swipeactions.icon-style" = "Styl ikony"; "settings.display.section.font" = "Czcionka"; diff --git a/IceCubesApp/Resources/Localization/pt-BR.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/pt-BR.lproj/Localizable.strings index 4ad3d070..ba6f4140 100644 --- a/IceCubesApp/Resources/Localization/pt-BR.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/pt-BR.lproj/Localizable.strings @@ -170,21 +170,22 @@ "settings.general.swipeactions" = "Swipe Actions"; "settings.swipeactions.navigation-title" = "Swipe Actions"; +"settings.swipeactions.primary" = "Primary Action"; +"settings.swipeactions.secondary" = "Secondary Action"; "settings.swipeactions.status.action.bookmark" = "Bookmark"; "settings.swipeactions.status.action.boost" = "Boost"; "settings.swipeactions.status.action.favorite" = "Favorite"; "settings.swipeactions.status.action.none" = "None"; "settings.swipeactions.status.action.quote" = "Quote"; "settings.swipeactions.status.action.reply" = "Reply"; -"settings.swipeactions.status.leading" = "Swipe right"; -"settings.swipeactions.status.leading.left" = "left"; -"settings.swipeactions.status.leading.right" = "right"; -"settings.swipeactions.status.trailing" = "Swipe left"; -"settings.swipeactions.status.trailing.left" = "left"; -"settings.swipeactions.status.trailing.right" = "right"; +"settings.swipeactions.status.explanation" = "Swipe actions are available upon swiping left or right on a post. The secondary action is only available if the primary action is set."; +"settings.swipeactions.status.leading" = "Swipe Right"; +"settings.swipeactions.status.trailing" = "Swipe Left"; "settings.swipeactions.status" = "Post"; -"settings.swipeactions.status.use-theme-colors" = "Use theme colors instead of default colors"; -"settings.swipeactions.status.icon-style" = "Icon style"; +"settings.swipeactions.appearance" = "Appearance"; +"settings.swipeactions.use-theme-colors" = "Use Theme Colors"; +"settings.swipeactions.use-theme-colors-explanation" = "Use theme colors instead of default colors"; +"settings.swipeactions.icon-style" = "Icon Style"; "settings.display.section.font" = "Font"; diff --git a/IceCubesApp/Resources/Localization/tr.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/tr.lproj/Localizable.strings index 0e8dc7aa..aaed2598 100644 --- a/IceCubesApp/Resources/Localization/tr.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/tr.lproj/Localizable.strings @@ -170,21 +170,22 @@ "settings.general.swipeactions" = "Swipe Actions"; "settings.swipeactions.navigation-title" = "Swipe Actions"; +"settings.swipeactions.primary" = "Primary Action"; +"settings.swipeactions.secondary" = "Secondary Action"; "settings.swipeactions.status.action.bookmark" = "Bookmark"; "settings.swipeactions.status.action.boost" = "Boost"; "settings.swipeactions.status.action.favorite" = "Favorite"; "settings.swipeactions.status.action.none" = "None"; "settings.swipeactions.status.action.quote" = "Quote"; "settings.swipeactions.status.action.reply" = "Reply"; -"settings.swipeactions.status.leading" = "Swipe right"; -"settings.swipeactions.status.leading.left" = "left"; -"settings.swipeactions.status.leading.right" = "right"; -"settings.swipeactions.status.trailing" = "Swipe left"; -"settings.swipeactions.status.trailing.left" = "left"; -"settings.swipeactions.status.trailing.right" = "right"; +"settings.swipeactions.status.explanation" = "Swipe actions are available upon swiping left or right on a post. The secondary action is only available if the primary action is set."; +"settings.swipeactions.status.leading" = "Swipe Right"; +"settings.swipeactions.status.trailing" = "Swipe Left"; "settings.swipeactions.status" = "Post"; -"settings.swipeactions.status.use-theme-colors" = "Use theme colors instead of default colors"; -"settings.swipeactions.status.icon-style" = "Icon style"; +"settings.swipeactions.appearance" = "Appearance"; +"settings.swipeactions.use-theme-colors" = "Use Theme Colors"; +"settings.swipeactions.use-theme-colors-explanation" = "Use theme colors instead of default colors"; +"settings.swipeactions.icon-style" = "Icon Style"; "settings.display.section.font" = "Font"; diff --git a/IceCubesApp/Resources/Localization/zh-Hans.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/zh-Hans.lproj/Localizable.strings index 661ba38b..30797112 100644 --- a/IceCubesApp/Resources/Localization/zh-Hans.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/zh-Hans.lproj/Localizable.strings @@ -167,22 +167,23 @@ "settings.display.show-ipad-column" = "启用边栏"; "settings.general.swipeactions" = "轻扫操作"; +"settings.swipeactions.appearance" = "Appearance"; "settings.swipeactions.navigation-title" = "轻扫操作设置"; +"settings.swipeactions.primary" = "Primary Action"; +"settings.swipeactions.secondary" = "Secondary Action"; "settings.swipeactions.status.action.bookmark" = "书签"; "settings.swipeactions.status.action.boost" = "转发"; "settings.swipeactions.status.action.favorite" = "喜欢"; "settings.swipeactions.status.action.none" = "无"; "settings.swipeactions.status.action.quote" = "引用"; "settings.swipeactions.status.action.reply" = "回复"; +"settings.swipeactions.status.explanation" = "Swipe actions are available upon swiping left or right on a post. The secondary action is only available if the primary action is set."; "settings.swipeactions.status.leading" = "向右轻扫"; -"settings.swipeactions.status.leading.left" = "左"; -"settings.swipeactions.status.leading.right" = "右"; "settings.swipeactions.status.trailing" = "向左轻扫"; -"settings.swipeactions.status.trailing.left" = "左"; -"settings.swipeactions.status.trailing.right" = "右"; "settings.swipeactions.status" = "嘟文"; -"settings.swipeactions.status.use-theme-colors" = "使用主题色而不是默认色"; -"settings.swipeactions.status.icon-style" = "图标样式"; +"settings.swipeactions.use-theme-colors" = "Use Theme Colors"; +"settings.swipeactions.use-theme-colors-explanation" = "使用主题色而不是默认色"; +"settings.swipeactions.icon-style" = "图标样式"; "settings.display.section.font" = "字体";