Spanish update 27-01 (#450)

* - Updated spanish localization with new keys
- Added missing NSLocalizedString for filters

* Fixed unresolved conflict

---------

Co-authored-by: Roberto Pastor <roberto.pastor@cabify.com>
This commit is contained in:
Roberto Pastor 2023-01-28 06:33:58 +01:00 committed by GitHub
parent 7c160ce731
commit 4cdd0214f4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 78 additions and 26 deletions

View file

@ -371,3 +371,10 @@
"filter.edit.keywords.add" = "Neues Wort hinzufügen";
"filter.edit.contexts" = "Filterkontext";
"filter.edit.action" = "Filteraktion";
"filter.contexts.home" = "Home and lists";
"filter.contexts.notifications" = "Notifications";
"filter.contexts.public" = "Public timelines";
"filter.contexts.conversations" = "Conversations";
"filter.contexts.profiles" = "Profiles";
"filter.action.warning" = "Hide with a warning";
"filter.action.hide" = "Hide completely";

View file

@ -370,3 +370,10 @@
"filter.edit.contexts" = "Filter Contexts";
"filter.edit.action" = "Filter Action";
"account.action.edit-filters" = "Edit Filters";
"filter.contexts.home" = "Home and lists";
"filter.contexts.notifications" = "Notifications";
"filter.contexts.public" = "Public timelines";
"filter.contexts.conversations" = "Conversations";
"filter.contexts.profiles" = "Profiles";
"filter.action.warning" = "Hide with a warning";
"filter.action.hide" = "Hide completely";

View file

@ -4,7 +4,7 @@
"action.save" = "Guardar";
"action.done" = "Hecho";
"action.retry" = "Reintentar";
"action.view.error" = "View error";
"action.view.error" = "Ver error";
"alert.button.ok" = "Ok";
"alert.error" = "¡Error!";
@ -112,7 +112,7 @@
"settings.other.hide-openai" = "Activar ayudante 🤖";
"settings.other.social-keyboard" = "Activar teclado social";
"settings.general.content" = "Ajustes de contenido";
"settings.system" = "System Settings";
"settings.system" = "Ajustes del sistema";
"settings.content.navigation-title" = "Ajustes de contenido";
"settings.content.use-instance-settings" = "Usar ajustes del servidor";
"settings.content.main-toggle.description" = "Usar ajustes de tu instancia inicial";
@ -122,9 +122,9 @@
"settings.content.default-visibility" = "Publicar visibilidad";
"settings.content.reading" = "Leyendo";
"settings.content.posting" = "Publicando";
"settings.push.duplicate.title" = "Duplicate notifications fixer";
"settings.push.duplicate.footer" = "Receiving duplicate notifications? Try this magic button in order to fix it";
"settings.push.duplicate.button.fix" = "🪄 Fix it";
"settings.push.duplicate.title" = "Arreglar notificaciones duplicadas";
"settings.push.duplicate.footer" = "¿Recibes notificaciones por duplicado? Usa este botón mágico para arreglarlo";
"settings.push.duplicate.button.fix" = "🪄 Arréglalo";
"enum.expand-media.show" = "Siempre";
"enum.expand-media.hide" = "Nunca";
"enum.expand-media.hide-sensitive" = "Ocultar contenido sensible";
@ -138,7 +138,7 @@
"tab.settings" = "Ajustes";
"tab.timeline" = "Cronología";
"tab.trending" = "Tendencias";
"tab.profile" = "Profile";
"tab.profile" = "Perfil";
// MARK: Timeline
"timeline.%@-is-valid" = "%@ es una instancia válida";
@ -201,7 +201,7 @@
"account.posts" = "Publicaciones";
"account.relation.follows-you" = "Te sigue";
"account.joined" = "Se unió el";
"account.action.logout" = "Logout account";
"account.action.logout" = "Cerrar sesión";
// MARK: Package: Conversations
"conversations.action.delete" = "Borrar";
@ -362,11 +362,18 @@
"status.visibility.unlisted" = "Sin listar";
// MARK: Filters
"filter.new" = "New Filter";
"filter.filters" = "Filters";
"filter.edit.title" = "Filter title";
"filter.edit.keywords" = "Filter Keywords";
"filter.edit.keywords.add" = "Add a new keyword";
"filter.edit.contexts" = "Filter Contexts";
"filter.edit.action" = "Filter Action";
"account.action.edit-filters" = "Edit Filters";
"filter.new" = "Nuevo filtro";
"filter.filters" = "Filtros";
"filter.edit.title" = "Título del filtro";
"filter.edit.keywords" = "Palabras claves del filtro";
"filter.edit.keywords.add" = "Añadir una nueva palabra clave";
"filter.edit.contexts" = "Contextos del filtro";
"filter.edit.action" = "Acción del filtro";
"account.action.edit-filters" = "Editar filtros";
"filter.contexts.home" = "Inicio y listas";
"filter.contexts.notifications" = "Notificaciones";
"filter.contexts.public" = "Cronologías públicas";
"filter.contexts.conversations" = "Conversaciones";
"filter.contexts.profiles" = "Perfiles";
"filter.action.warning" = "Ocultar con una advertencia";
"filter.action.hide" = "Ocultar completamente";

View file

@ -371,3 +371,10 @@
"filter.edit.contexts" = "Dove applicare il filtro";
"filter.edit.action" = "Azione del filtro";
"account.action.edit-filters" = "Modifica filtri";
"filter.contexts.home" = "Home and lists";
"filter.contexts.notifications" = "Notifications";
"filter.contexts.public" = "Public timelines";
"filter.contexts.conversations" = "Conversations";
"filter.contexts.profiles" = "Profiles";
"filter.action.warning" = "Hide with a warning";
"filter.action.hide" = "Hide completely";

View file

@ -363,8 +363,13 @@
"filter.edit.keywords.add" = "新しいキーワードを追加する";
"filter.edit.contexts" = "フィルターする文章";
"filter.edit.action" = "フィルターする";
"account.action.edit-filters" = "フィルターを編集する";
"account.action.edit-filters" = "フィルターを編集する";
"filter.contexts.home" = "Home and lists";
"filter.contexts.notifications" = "Notifications";
"filter.contexts.public" = "Public timelines";
"filter.contexts.conversations" = "Conversations";
"filter.contexts.profiles" = "Profiles";
"filter.action.warning" = "Hide with a warning";
"filter.action.hide" = "Hide completely";
"enum.expand-media.show" = "全て表示";
"enum.expand-media.hide" = "全て隠す";

View file

@ -367,7 +367,13 @@
"filter.edit.keywords.add" = "Voeg een nieuw sleutelwoord toe";
"filter.edit.contexts" = "Filtercontext";
"filter.edit.action" = "Filteractie";
"account.action.edit-filters" = "Bewerk filters";
"filter.contexts.home" = "Home and lists";
"filter.contexts.notifications" = "Notifications";
"filter.contexts.public" = "Public timelines";
"filter.contexts.conversations" = "Conversations";
"filter.contexts.profiles" = "Profiles";
"filter.action.warning" = "Hide with a warning";
"filter.action.hide" = "Hide completely";
"enum.expand-media.show" = "Toon alle";
"enum.expand-media.hide" = "Verberg alle";

View file

@ -352,6 +352,13 @@
"filter.edit.contexts" = "Filter Contexts";
"filter.edit.action" = "Filter Action";
"account.action.edit-filters" = "Edit Filters";
"filter.contexts.home" = "Home and lists";
"filter.contexts.notifications" = "Notifications";
"filter.contexts.public" = "Public timelines";
"filter.contexts.conversations" = "Conversations";
"filter.contexts.profiles" = "Profiles";
"filter.action.warning" = "Hide with a warning";
"filter.action.hide" = "Hide completely";
"enum.expand-media.show" = "Show All";
"enum.expand-media.hide" = "Hide All";

View file

@ -369,7 +369,13 @@
"filter.edit.keywords.add" = "添加关键词";
"filter.edit.contexts" = "过滤范围";
"filter.edit.action" = "过滤器行为";
"account.action.edit-filters" = "编辑过滤器";
"filter.contexts.home" = "Home and lists";
"filter.contexts.notifications" = "Notifications";
"filter.contexts.public" = "Public timelines";
"filter.contexts.conversations" = "Conversations";
"filter.contexts.profiles" = "Profiles";
"filter.action.warning" = "Hide with a warning";
"filter.action.hide" = "Hide completely";
"enum.expand-media.show" = "显示所有";
"enum.expand-media.hide" = "隐藏所有";

View file

@ -42,15 +42,15 @@ public extension ServerFilter.Context {
var name: String {
switch self {
case .home:
return "Home and lists"
return NSLocalizedString("filter.contexts.home", comment: "")
case .notifications:
return "Notifications"
return NSLocalizedString("filter.contexts.notifications", comment: "")
case .public:
return "Public timelines"
return NSLocalizedString("filter.contexts.public", comment: "")
case .thread:
return "Conversations"
return NSLocalizedString("filter.contexts.conversations", comment: "")
case .account:
return "Profiles"
return NSLocalizedString("filter.contexts.profiles", comment: "")
}
}
}
@ -59,9 +59,9 @@ public extension ServerFilter.Action {
var label: String {
switch self {
case .warn:
return "Hide with a warning"
return NSLocalizedString("filter.action.warning", comment: "")
case .hide:
return "Hide completely"
return NSLocalizedString("filter.action.hide", comment: "")
}
}
}