Merge pull request #1717 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
This commit is contained in:
Claire
GitHub
commit
76d6fe63c3
|
|
@ -0,0 +1,24 @@
|
|||
# [Choice] Ruby version (use -bullseye variants on local arm64/Apple Silicon): 3, 3.1, 3.0, 2, 2.7, 2.6, 3-bullseye, 3.1-bullseye, 3.0-bullseye, 2-bullseye, 2.7-bullseye, 2.6-bullseye, 3-buster, 3.1-buster, 3.0-buster, 2-buster, 2.7-buster, 2.6-buster
|
||||
ARG VARIANT=3.1-bullseye
|
||||
FROM mcr.microsoft.com/vscode/devcontainers/ruby:${VARIANT}
|
||||
|
||||
# Install Rails
|
||||
# RUN gem install rails webdrivers
|
||||
|
||||
# Default value to allow debug server to serve content over GitHub Codespace's port forwarding service
|
||||
# The value is a comma-separated list of allowed domains
|
||||
ENV RAILS_DEVELOPMENT_HOSTS=".githubpreview.dev"
|
||||
|
||||
# [Choice] Node.js version: lts/*, 16, 14, 12, 10
|
||||
ARG NODE_VERSION="lts/*"
|
||||
RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"
|
||||
|
||||
# [Optional] Uncomment this section to install additional OS packages.
|
||||
RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
|
||||
&& apt-get -y install --no-install-recommends libicu-dev libidn11-dev ffmpeg imagemagick libpam-dev
|
||||
|
||||
# [Optional] Uncomment this line to install additional gems.
|
||||
RUN gem install foreman
|
||||
|
||||
# [Optional] Uncomment this line to install global node packages.
|
||||
RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g yarn" 2>&1
|
||||
|
|
@ -0,0 +1,26 @@
|
|||
{
|
||||
"name": "Mastodon",
|
||||
"dockerComposeFile": "docker-compose.yml",
|
||||
"service": "app",
|
||||
"workspaceFolder": "/workspaces/mastodon",
|
||||
|
||||
// Set *default* container specific settings.json values on container create.
|
||||
"settings": {},
|
||||
|
||||
// Add the IDs of extensions you want installed when the container is created.
|
||||
"extensions": [
|
||||
"EditorConfig.EditorConfig",
|
||||
"dbaeumer.vscode-eslint",
|
||||
"rebornix.Ruby"
|
||||
],
|
||||
|
||||
// Use 'forwardPorts' to make a list of ports inside the container available locally.
|
||||
// This can be used to network with other containers or the host.
|
||||
"forwardPorts": [3000, 4000],
|
||||
|
||||
// Use 'postCreateCommand' to run commands after the container is created.
|
||||
"postCreateCommand": "bundle install --path vendor/bundle && yarn install && ./bin/rails db:setup",
|
||||
|
||||
// Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
|
||||
"remoteUser": "vscode"
|
||||
}
|
||||
|
|
@ -0,0 +1,84 @@
|
|||
version: '3'
|
||||
|
||||
services:
|
||||
app:
|
||||
build:
|
||||
context: .
|
||||
dockerfile: Dockerfile
|
||||
args:
|
||||
# Update 'VARIANT' to pick a version of Ruby: 3, 3.1, 3.0, 2, 2.7, 2.6
|
||||
# Append -bullseye or -buster to pin to an OS version.
|
||||
# Use -bullseye variants on local arm64/Apple Silicon.
|
||||
VARIANT: "3.0-bullseye"
|
||||
# Optional Node.js version to install
|
||||
NODE_VERSION: "14"
|
||||
volumes:
|
||||
- ..:/workspaces/mastodon:cached
|
||||
environment:
|
||||
RAILS_ENV: development
|
||||
NODE_ENV: development
|
||||
|
||||
REDIS_HOST: redis
|
||||
REDIS_PORT: '6379'
|
||||
DB_HOST: db
|
||||
DB_USER: postgres
|
||||
DB_PASS: postgres
|
||||
DB_PORT: '5432'
|
||||
ES_ENABLED: 'true'
|
||||
ES_HOST: es
|
||||
ES_PORT: '9200'
|
||||
# Overrides default command so things don't shut down after the process ends.
|
||||
command: sleep infinity
|
||||
networks:
|
||||
- external_network
|
||||
- internal_network
|
||||
user: vscode
|
||||
|
||||
|
||||
db:
|
||||
image: postgres:14-alpine
|
||||
restart: unless-stopped
|
||||
volumes:
|
||||
- postgres-data:/var/lib/postgresql/data
|
||||
environment:
|
||||
POSTGRES_USER: postgres
|
||||
POSTGRES_DB: postgres
|
||||
POSTGRES_PASSWORD: postgres
|
||||
POSTGRES_HOST_AUTH_METHOD: trust
|
||||
networks:
|
||||
- internal_network
|
||||
|
||||
redis:
|
||||
image: redis:6-alpine
|
||||
restart: unless-stopped
|
||||
volumes:
|
||||
- redis-data:/data
|
||||
networks:
|
||||
- internal_network
|
||||
|
||||
es:
|
||||
image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.2
|
||||
restart: unless-stopped
|
||||
environment:
|
||||
ES_JAVA_OPTS: -Xms512m -Xmx512m
|
||||
cluster.name: es-mastodon
|
||||
discovery.type: single-node
|
||||
bootstrap.memory_lock: 'true'
|
||||
volumes:
|
||||
- es-data:/usr/share/elasticsearch/data
|
||||
networks:
|
||||
- internal_network
|
||||
ulimits:
|
||||
memlock:
|
||||
soft: -1
|
||||
hard: -1
|
||||
|
||||
volumes:
|
||||
postgres-data:
|
||||
redis-data:
|
||||
es-data:
|
||||
|
||||
networks:
|
||||
external_network:
|
||||
internal_network:
|
||||
internal: true
|
||||
|
|
@ -56,7 +56,7 @@ class Explore extends React.PureComponent {
|
|||
</div>
|
||||
) : (
|
||||
<ColumnHeader
|
||||
icon={isSearching ? 'search' : 'globe'}
|
||||
icon={isSearching ? 'search' : 'hashtag'}
|
||||
title={intl.formatMessage(isSearching ? messages.searchResults : messages.title)}
|
||||
onClick={this.handleHeaderClick}
|
||||
multiColumn={multiColumn}
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@ const messages = defineMessages({
|
|||
public_timeline: { id: 'navigation_bar.public_timeline', defaultMessage: 'Federated timeline' },
|
||||
settings_subheading: { id: 'column_subheading.settings', defaultMessage: 'Settings' },
|
||||
community_timeline: { id: 'navigation_bar.community_timeline', defaultMessage: 'Local timeline' },
|
||||
explore: { id: 'navigation_bar.explore', defaultMessage: 'Explore' },
|
||||
direct: { id: 'navigation_bar.direct', defaultMessage: 'Direct messages' },
|
||||
bookmarks: { id: 'navigation_bar.bookmarks', defaultMessage: 'Bookmarks' },
|
||||
preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' },
|
||||
|
|
@ -97,11 +98,22 @@ class GettingStarted extends ImmutablePureComponent {
|
|||
if (multiColumn) {
|
||||
navItems.push(
|
||||
<ColumnSubheading key='header-discover' text={intl.formatMessage(messages.discover)} />,
|
||||
);
|
||||
height += 34;
|
||||
}
|
||||
|
||||
navItems.push(
|
||||
<ColumnLink key='explore' icon='hashtag' text={intl.formatMessage(messages.explore)} to='/explore' />,
|
||||
);
|
||||
height += 48;
|
||||
|
||||
if (multiColumn) {
|
||||
navItems.push(
|
||||
<ColumnLink key='community_timeline' icon='users' text={intl.formatMessage(messages.community_timeline)} to='/public/local' />,
|
||||
<ColumnLink key='public_timeline' icon='globe' text={intl.formatMessage(messages.public_timeline)} to='/public' />,
|
||||
);
|
||||
|
||||
height += 34 + 48*2;
|
||||
height += 48*2;
|
||||
|
||||
navItems.push(
|
||||
<ColumnSubheading key='header-personal' text={intl.formatMessage(messages.personal)} />,
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ const NavigationPanel = () => (
|
|||
<NavLink className='column-link column-link--transparent' to='/home' data-preview-title-id='column.home' data-preview-icon='home' ><Icon className='column-link__icon' id='home' fixedWidth /><FormattedMessage id='tabs_bar.home' defaultMessage='Home' /></NavLink>
|
||||
<NavLink className='column-link column-link--transparent' to='/notifications' data-preview-title-id='column.notifications' data-preview-icon='bell' ><NotificationsCounterIcon className='column-link__icon' /><FormattedMessage id='tabs_bar.notifications' defaultMessage='Notifications' /></NavLink>
|
||||
<FollowRequestsNavLink />
|
||||
<NavLink className='column-link column-link--transparent' to='/explore' data-preview-title-id='explore.title' data-preview-icon='globe'><Icon className='column-link__icon' id='globe' fixedWidth /><FormattedMessage id='explore.title' defaultMessage='Explore' /></NavLink>
|
||||
<NavLink className='column-link column-link--transparent' to='/explore' data-preview-title-id='explore.title' data-preview-icon='hashtag'><Icon className='column-link__icon' id='hashtag' fixedWidth /><FormattedMessage id='explore.title' defaultMessage='Explore' /></NavLink>
|
||||
<NavLink className='column-link column-link--transparent' to='/public/local' data-preview-title-id='column.community' data-preview-icon='users' ><Icon className='column-link__icon' id='users' fixedWidth /><FormattedMessage id='tabs_bar.local_timeline' defaultMessage='Local' /></NavLink>
|
||||
<NavLink className='column-link column-link--transparent' exact to='/public' data-preview-title-id='column.public' data-preview-icon='globe' ><Icon className='column-link__icon' id='globe' fixedWidth /><FormattedMessage id='tabs_bar.federated_timeline' defaultMessage='Federated' /></NavLink>
|
||||
<NavLink className='column-link column-link--transparent' to='/conversations'><Icon className='column-link__icon' id='envelope' fixedWidth /><FormattedMessage id='navigation_bar.direct' defaultMessage='Direct messages' /></NavLink>
|
||||
|
|
|
|||
|
|
@ -10,9 +10,9 @@ import NotificationsCounterIcon from './notifications_counter_icon';
|
|||
export const links = [
|
||||
<NavLink className='tabs-bar__link' to='/home' data-preview-title-id='column.home' data-preview-icon='home' ><Icon id='home' fixedWidth /><FormattedMessage id='tabs_bar.home' defaultMessage='Home' /></NavLink>,
|
||||
<NavLink className='tabs-bar__link' to='/notifications' data-preview-title-id='column.notifications' data-preview-icon='bell' ><NotificationsCounterIcon /><FormattedMessage id='tabs_bar.notifications' defaultMessage='Notifications' /></NavLink>,
|
||||
<NavLink className='tabs-bar__link optional' to='/public/local' data-preview-title-id='column.community' data-preview-icon='users' ><Icon id='users' fixedWidth /><FormattedMessage id='tabs_bar.local_timeline' defaultMessage='Local' /></NavLink>,
|
||||
<NavLink className='tabs-bar__link optional' exact to='/public' data-preview-title-id='column.public' data-preview-icon='globe' ><Icon id='globe' fixedWidth /><FormattedMessage id='tabs_bar.federated_timeline' defaultMessage='Federated' /></NavLink>,
|
||||
<NavLink className='tabs-bar__link' to='/explore' data-preview-title-id='tabs_bar.search' data-preview-icon='search' ><Icon id='search' fixedWidth /><FormattedMessage id='tabs_bar.search' defaultMessage='Search' /></NavLink>,
|
||||
<NavLink className='tabs-bar__link' to='/public/local' data-preview-title-id='column.community' data-preview-icon='users' ><Icon id='users' fixedWidth /><FormattedMessage id='tabs_bar.local_timeline' defaultMessage='Local' /></NavLink>,
|
||||
<NavLink className='tabs-bar__link' exact to='/public' data-preview-title-id='column.public' data-preview-icon='globe' ><Icon id='globe' fixedWidth /><FormattedMessage id='tabs_bar.federated_timeline' defaultMessage='Federated' /></NavLink>,
|
||||
<NavLink className='tabs-bar__link optional' to='/explore' data-preview-title-id='tabs_bar.search' data-preview-icon='search' ><Icon id='search' fixedWidth /><FormattedMessage id='tabs_bar.search' defaultMessage='Search' /></NavLink>,
|
||||
<NavLink className='tabs-bar__link' style={{ flexGrow: '0', flexBasis: '30px' }} to='/getting-started' data-preview-title-id='getting_started.heading' data-preview-icon='bars' ><Icon id='bars' fixedWidth /></NavLink>,
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -1956,6 +1956,10 @@
|
|||
"defaultMessage": "Local timeline",
|
||||
"id": "navigation_bar.community_timeline"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Explore",
|
||||
"id": "navigation_bar.explore"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Direct messages",
|
||||
"id": "navigation_bar.direct"
|
||||
|
|
|
|||
|
|
@ -298,6 +298,7 @@
|
|||
"navigation_bar.discover": "Discover",
|
||||
"navigation_bar.domain_blocks": "Blocked domains",
|
||||
"navigation_bar.edit_profile": "Edit profile",
|
||||
"navigation_bar.explore": "Explore",
|
||||
"navigation_bar.favourites": "Favourites",
|
||||
"navigation_bar.filters": "Muted words",
|
||||
"navigation_bar.follow_requests": "Follow requests",
|
||||
|
|
|
|||
|
|
@ -32,8 +32,12 @@ class Instance < ApplicationRecord
|
|||
@delivery_failure_tracker ||= DeliveryFailureTracker.new(domain)
|
||||
end
|
||||
|
||||
def purgeable?
|
||||
unavailable? || domain_block&.suspend?
|
||||
end
|
||||
|
||||
def unavailable?
|
||||
unavailable_domain.present? || domain_block&.suspend?
|
||||
unavailable_domain.present?
|
||||
end
|
||||
|
||||
def failing?
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
.fields-group
|
||||
= f.input :shortcode, wrapper: :with_label, label: t('admin.custom_emojis.shortcode'), hint: t('admin.custom_emojis.shortcode_hint')
|
||||
.fields-group
|
||||
= f.input :image, wrapper: :with_label, input_html: { accept: 'image/png' }, hint: t('admin.custom_emojis.image_hint')
|
||||
= f.input :image, wrapper: :with_label, input_html: { accept: CustomEmoji::IMAGE_MIME_TYPES.join(' ') }, hint: t('admin.custom_emojis.image_hint', size: number_to_human_size(CustomEmoji::LIMIT))
|
||||
|
||||
.actions
|
||||
= f.button :button, t('admin.custom_emojis.upload'), type: :submit
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@
|
|||
= t('admin.instances.availability.failures_recorded', count: @instance.delivery_failure_tracker.days)
|
||||
= link_to t('admin.instances.delivery.clear'), clear_delivery_errors_admin_instance_path(@instance), data: { confirm: t('admin.accounts.are_you_sure'), method: :post } unless @instance.exhausted_deliveries_days.empty?
|
||||
|
||||
- if @instance.unavailable?
|
||||
- if @instance.purgeable?
|
||||
%p= t('admin.instances.purge_description_html')
|
||||
|
||||
= link_to t('admin.instances.purge'), admin_instance_path(@instance), data: { confirm: t('admin.instances.confirm_purge'), method: :delete }, class: 'button button--destructive'
|
||||
|
|
|
|||
|
|
@ -376,7 +376,6 @@ ar:
|
|||
enable: تفعيل
|
||||
enabled: مُشغَّل
|
||||
enabled_msg: تم تنشيط ذاك الإيموجي بنجاح
|
||||
image_hint: ملف PNG إلى غاية حجم 50 ك.ب
|
||||
list: القائمة
|
||||
listed: مُدرَج
|
||||
new:
|
||||
|
|
|
|||
|
|
@ -234,7 +234,6 @@ bn:
|
|||
enable: সক্রিয়
|
||||
enabled: সক্রিয়
|
||||
enabled_msg: সফলভাবে সেই ইমোজি সক্ষম করা হয়েছে
|
||||
image_hint: ৫০কেবি অবধি পিএনজি
|
||||
list: তালিকা
|
||||
listed: তালিকাভুক্ত
|
||||
new:
|
||||
|
|
|
|||
|
|
@ -373,7 +373,6 @@ ca:
|
|||
enable: Habilita
|
||||
enabled: Activat
|
||||
enabled_msg: S'ha habilitat amb èxit emoji
|
||||
image_hint: PNG de fins a 50 KB
|
||||
list: Llista
|
||||
listed: Enumerat
|
||||
new:
|
||||
|
|
|
|||
|
|
@ -348,7 +348,6 @@ co:
|
|||
enable: Attivà
|
||||
enabled: Attivate
|
||||
enabled_msg: L’emoji hè stata attivata
|
||||
image_hint: PNG di 50Ko o menu
|
||||
list: Listà
|
||||
listed: Listata
|
||||
new:
|
||||
|
|
|
|||
|
|
@ -366,7 +366,6 @@ cs:
|
|||
enable: Povolit
|
||||
enabled: Povoleno
|
||||
enabled_msg: Emoji bylo úspěšně povoleno
|
||||
image_hint: PNG až do 50 KB
|
||||
list: Uvést
|
||||
listed: Uvedeno
|
||||
new:
|
||||
|
|
|
|||
|
|
@ -278,7 +278,6 @@ cy:
|
|||
enable: Galluogi
|
||||
enabled: Wedi ei alluogi
|
||||
enabled_msg: Llwyddwyd i alluogi yr emoji hwnnw
|
||||
image_hint: PNG hyd at 50KB
|
||||
list: Rhestr
|
||||
listed: Rhestredig
|
||||
new:
|
||||
|
|
|
|||
|
|
@ -373,7 +373,6 @@ da:
|
|||
enable: Aktivér
|
||||
enabled: Aktiveret
|
||||
enabled_msg: Denne emoji er nu aktiv
|
||||
image_hint: PNG op til 50 kB
|
||||
list: Oplist
|
||||
listed: Oplistet
|
||||
new:
|
||||
|
|
|
|||
|
|
@ -373,7 +373,6 @@ de:
|
|||
enable: Aktivieren
|
||||
enabled: Aktiviert
|
||||
enabled_msg: Das Emoji wurde aktiviert
|
||||
image_hint: PNG bis zu 50 kB
|
||||
list: Liste
|
||||
listed: Gelistet
|
||||
new:
|
||||
|
|
|
|||
|
|
@ -306,7 +306,6 @@ el:
|
|||
enable: Ενεργοποίηση
|
||||
enabled: Ενεργοποιημένα
|
||||
enabled_msg: Επιτυχής ενεργοποίηση αυτού του emoji
|
||||
image_hint: PNG έως 50KB
|
||||
list: Εμφάνιση
|
||||
listed: Αναφερθέντα
|
||||
new:
|
||||
|
|
|
|||
|
|
@ -373,7 +373,7 @@ en:
|
|||
enable: Enable
|
||||
enabled: Enabled
|
||||
enabled_msg: Successfully enabled that emoji
|
||||
image_hint: PNG up to 50KB
|
||||
image_hint: PNG or GIF up to %{size}
|
||||
list: List
|
||||
listed: Listed
|
||||
new:
|
||||
|
|
|
|||
|
|
@ -220,7 +220,6 @@ en_GB:
|
|||
emoji: Emoji
|
||||
enable: Enable
|
||||
enabled_msg: Successfully enabled that emoji
|
||||
image_hint: PNG up to 50KB
|
||||
listed: Listed
|
||||
new:
|
||||
title: Add new custom emoji
|
||||
|
|
|
|||
|
|
@ -308,7 +308,6 @@ eo:
|
|||
enable: Ebligi
|
||||
enabled: Ebligita
|
||||
enabled_msg: Tiu emoĝio estis sukcese ebligita
|
||||
image_hint: PNG ĝis 50KB
|
||||
list: Listo
|
||||
listed: Listigita
|
||||
new:
|
||||
|
|
|
|||
|
|
@ -373,7 +373,6 @@ es-AR:
|
|||
enable: Habilitar
|
||||
enabled: Habilitado
|
||||
enabled_msg: Se habilitó ese emoji exitosamente
|
||||
image_hint: PNG de hasta 50KB
|
||||
list: Listar
|
||||
listed: Listados
|
||||
new:
|
||||
|
|
|
|||
|
|
@ -373,7 +373,6 @@ es-MX:
|
|||
enable: Habilitar
|
||||
enabled: Activado
|
||||
enabled_msg: Se habilitó con éxito ese emoji
|
||||
image_hint: PNG de hasta 50KB
|
||||
list: Lista
|
||||
listed: Listados
|
||||
new:
|
||||
|
|
|
|||
|
|
@ -373,7 +373,6 @@ es:
|
|||
enable: Habilitar
|
||||
enabled: Activado
|
||||
enabled_msg: Se habilitó con éxito ese emoji
|
||||
image_hint: PNG de hasta 50KB
|
||||
list: Lista
|
||||
listed: Listados
|
||||
new:
|
||||
|
|
|
|||
|
|
@ -258,7 +258,6 @@ et:
|
|||
enable: Luba
|
||||
enabled: Lubatud
|
||||
enabled_msg: Selle emotikoni lubamine õnnestus
|
||||
image_hint: PNG kuni 50KB
|
||||
list: Loend
|
||||
listed: Nimekirjastatud
|
||||
new:
|
||||
|
|
|
|||
|
|
@ -362,7 +362,6 @@ eu:
|
|||
enable: Gaitu
|
||||
enabled: Gaituta
|
||||
enabled_msg: Emoji hori ongi gaitu da
|
||||
image_hint: PNG gehienez 50KB
|
||||
list: Zerrendatu
|
||||
listed: Zerrendatua
|
||||
new:
|
||||
|
|
|
|||
|
|
@ -360,7 +360,6 @@ fa:
|
|||
enable: به کار انداختن
|
||||
enabled: فعال
|
||||
enabled_msg: این شکلک با موفقیت فعال شد
|
||||
image_hint: پروندهٔ PNG حداکثر 50KB
|
||||
list: فهرست
|
||||
listed: فهرست شده
|
||||
new:
|
||||
|
|
|
|||
|
|
@ -373,7 +373,6 @@ fi:
|
|||
enable: Ota käyttöön
|
||||
enabled: Käytössä
|
||||
enabled_msg: Emojin käyttöönotto onnistui
|
||||
image_hint: PNG enintään 50 kt
|
||||
list: Listaa
|
||||
listed: Listassa
|
||||
new:
|
||||
|
|
|
|||
|
|
@ -373,7 +373,6 @@ fr:
|
|||
enable: Activer
|
||||
enabled: Activé
|
||||
enabled_msg: Émoji activé avec succès
|
||||
image_hint: PNG de moins de 50 Ko
|
||||
list: Lister
|
||||
listed: Listé
|
||||
new:
|
||||
|
|
|
|||
|
|
@ -381,7 +381,6 @@ gd:
|
|||
enable: Cuir an comas
|
||||
enabled: Chaidh a chur an comas
|
||||
enabled_msg: Chaidh an t-Emoji sin a chur an comas
|
||||
image_hint: PNG suas ri 50KB
|
||||
list: Liosta
|
||||
listed: Liostaichte
|
||||
new:
|
||||
|
|
|
|||
|
|
@ -373,7 +373,6 @@ gl:
|
|||
enable: Activar
|
||||
enabled: Activado
|
||||
enabled_msg: Activouse a emoticona de xeito correcto
|
||||
image_hint: PNG de até 50KB
|
||||
list: Listar
|
||||
listed: Listado
|
||||
new:
|
||||
|
|
|
|||
|
|
@ -375,7 +375,6 @@ hu:
|
|||
enable: Engedélyezés
|
||||
enabled: Engedélyezve
|
||||
enabled_msg: Emodzsi sikeresen engedélyezve
|
||||
image_hint: PNG (legfeljebb 50 kB-os)
|
||||
list: Felsorolás
|
||||
listed: Felsorolva
|
||||
new:
|
||||
|
|
|
|||
|
|
@ -295,7 +295,6 @@ hy:
|
|||
enable: Միացնել
|
||||
enabled: Միացուած
|
||||
enabled_msg: Յաջողութեամբ միացուեց էմոջին
|
||||
image_hint: PNG մինչեւ 50KB
|
||||
list: Ցանկ
|
||||
listed: Ցուցակագրուած
|
||||
new:
|
||||
|
|
|
|||
|
|
@ -367,7 +367,6 @@ id:
|
|||
enable: Aktifkan
|
||||
enabled: Diaktifkan
|
||||
enabled_msg: Emoji berhasil diaktifkan
|
||||
image_hint: PNG hingga 50KB
|
||||
list: Daftar
|
||||
listed: Terdaftar
|
||||
new:
|
||||
|
|
|
|||
|
|
@ -373,7 +373,6 @@ is:
|
|||
enable: Virkja
|
||||
enabled: Virkt
|
||||
enabled_msg: Tókst að gera þetta tjáningartákn virkt
|
||||
image_hint: PNG allt að 50KB
|
||||
list: Listi
|
||||
listed: Skráð
|
||||
new:
|
||||
|
|
|
|||
|
|
@ -373,7 +373,6 @@ it:
|
|||
enable: Abilita
|
||||
enabled: Abilitato
|
||||
enabled_msg: Questa emoji è stata abilitata con successo
|
||||
image_hint: PNG fino a 50 KB
|
||||
list: Includi nell'elenco
|
||||
listed: Elencato
|
||||
new:
|
||||
|
|
|
|||
|
|
@ -361,7 +361,6 @@ ja:
|
|||
enable: 有効化
|
||||
enabled: 有効
|
||||
enabled_msg: 絵文字を有効化しました
|
||||
image_hint: 50KBまでのPNG画像を利用できます
|
||||
list: 表示
|
||||
listed: 表示
|
||||
new:
|
||||
|
|
|
|||
|
|
@ -139,7 +139,6 @@ ka:
|
|||
emoji: ემოჯი
|
||||
enable: ჩართვა
|
||||
enabled_msg: წარმატებით ჩაირთო ეს ემოჯი
|
||||
image_hint: PNG 50კბმდე
|
||||
listed: ჩამოთვლილი
|
||||
new:
|
||||
title: ახალი პერსონალიზირებული ემოჯის დამატება
|
||||
|
|
|
|||
|
|
@ -292,7 +292,6 @@ kab:
|
|||
enable: Rmed
|
||||
enabled: Yermed
|
||||
enabled_msg: Imuji yermed mebla ugur
|
||||
image_hint: PNG n ddaw n 50KT
|
||||
list: Umuγ
|
||||
new:
|
||||
title: Timerna n imuji udmawan amaynut
|
||||
|
|
|
|||
|
|
@ -211,7 +211,6 @@ kk:
|
|||
enable: Қосу
|
||||
enabled: Қосылды
|
||||
enabled_msg: Эмодзи сәтті қосылды
|
||||
image_hint: PNG 50KB
|
||||
list: Тізім
|
||||
listed: Тізілді
|
||||
new:
|
||||
|
|
|
|||
|
|
@ -373,7 +373,6 @@ kmr:
|
|||
enable: Çalak bike
|
||||
enabled: Çalakkirî
|
||||
enabled_msg: Ev hestok bi serkeftî hate çalak kirin
|
||||
image_hint: Mezinahiya pelê PNG heya 50Kb te
|
||||
list: Rêzok
|
||||
listed: Rêzokkirî
|
||||
new:
|
||||
|
|
|
|||
|
|
@ -369,7 +369,6 @@ ko:
|
|||
enable: 활성화
|
||||
enabled: 활성됨
|
||||
enabled_msg: 성공적으로 활성화하였습니다
|
||||
image_hint: 50KB 이하의 PNG
|
||||
list: 목록에 추가
|
||||
listed: 목록에 실림
|
||||
new:
|
||||
|
|
|
|||
|
|
@ -285,7 +285,6 @@ ku:
|
|||
enable: چالاککردن
|
||||
enabled: چالاککراوە
|
||||
enabled_msg: ئەو ئیمۆجییە بە سەرکەوتووانە چالاک کرا
|
||||
image_hint: PNG تا ٥٠کیلۆبایت
|
||||
list: پێرست
|
||||
listed: پێرستکراوە
|
||||
new:
|
||||
|
|
|
|||
|
|
@ -151,7 +151,6 @@ lt:
|
|||
emoji: Jaustukas
|
||||
enable: Įjungti
|
||||
enabled_msg: Šis jaustukas sėkmingai įjungtas
|
||||
image_hint: PNG failo dydis iki 50KB
|
||||
listed: Įtrauktas į sąrašą
|
||||
new:
|
||||
title: Pridėti naują jaustuką
|
||||
|
|
|
|||
|
|
@ -377,7 +377,6 @@ lv:
|
|||
enable: Iespējot
|
||||
enabled: Iespējots
|
||||
enabled_msg: Šī emocijzīme ir veiksmīgi iespējota
|
||||
image_hint: PNG līdz 50 KB
|
||||
list: Saraksts
|
||||
listed: Uzrakstītas
|
||||
new:
|
||||
|
|
|
|||
|
|
@ -334,7 +334,6 @@ ms:
|
|||
enable: Dayakan
|
||||
enabled: Didayakan
|
||||
enabled_msg: Emoji tersebut berjaya didayakan
|
||||
image_hint: PNG, maksimum 50KB
|
||||
list: Senarai
|
||||
listed: Disenaraikan
|
||||
new:
|
||||
|
|
|
|||
|
|
@ -337,7 +337,6 @@ nl:
|
|||
enable: Inschakelen
|
||||
enabled: Ingeschakeld
|
||||
enabled_msg: Inschakelen van deze emoji geslaagd
|
||||
image_hint: PNG van max. 50KB
|
||||
list: In lijst
|
||||
listed: Weergegeven
|
||||
new:
|
||||
|
|
|
|||
|
|
@ -300,7 +300,6 @@ nn:
|
|||
enable: Slå på
|
||||
enabled: Slege på
|
||||
enabled_msg: Aktiverte kjensleteikn
|
||||
image_hint: PNG opp til 50 kB
|
||||
list: Oppfør
|
||||
listed: Oppført
|
||||
new:
|
||||
|
|
|
|||
|
|
@ -297,7 +297,6 @@
|
|||
enable: Aktivere
|
||||
enabled: Skrudd på
|
||||
enabled_msg: Aktiverte emojien uten problem
|
||||
image_hint: PNG opp til 50KB
|
||||
list: Før opp
|
||||
listed: Oppførte
|
||||
new:
|
||||
|
|
|
|||
|
|
@ -265,7 +265,6 @@ oc:
|
|||
enable: Activar
|
||||
enabled: Activat
|
||||
enabled_msg: Aqueste emoji es ben activat
|
||||
image_hint: PNG cap a 50Ko
|
||||
list: Listar
|
||||
listed: Listat
|
||||
new:
|
||||
|
|
|
|||
|
|
@ -378,7 +378,6 @@ pl:
|
|||
enable: Włącz
|
||||
enabled: Włączone
|
||||
enabled_msg: Pomyślnie przywrócono emoji
|
||||
image_hint: Plik PNG ważący do 50KB
|
||||
list: Dodaj do listy
|
||||
listed: Widoczne
|
||||
new:
|
||||
|
|
|
|||
|
|
@ -359,7 +359,6 @@ pt-BR:
|
|||
enable: Ativar
|
||||
enabled: Ativado
|
||||
enabled_msg: Emoji ativado com sucesso
|
||||
image_hint: PNG de até 50KB
|
||||
list: Listar
|
||||
listed: Listado
|
||||
new:
|
||||
|
|
|
|||
|
|
@ -373,7 +373,6 @@ pt-PT:
|
|||
enable: Ativar
|
||||
enabled: Ativado
|
||||
enabled_msg: Ativado com sucesso este emoji
|
||||
image_hint: PNG de até 50KB
|
||||
list: Lista
|
||||
listed: Listado
|
||||
new:
|
||||
|
|
|
|||
|
|
@ -378,7 +378,6 @@ ru:
|
|||
enable: Включить
|
||||
enabled: Включено
|
||||
enabled_msg: Эмодзи успешно включено
|
||||
image_hint: PNG до 50KB
|
||||
list: Список
|
||||
listed: В списке
|
||||
new:
|
||||
|
|
|
|||
|
|
@ -334,7 +334,6 @@ sc:
|
|||
enable: Ativa
|
||||
enabled: Ativadu
|
||||
enabled_msg: As ativadu s'emoji
|
||||
image_hint: PNG de finas a 50 KB
|
||||
list: Lista
|
||||
listed: Listadu
|
||||
new:
|
||||
|
|
|
|||
|
|
@ -289,7 +289,6 @@ sk:
|
|||
enable: Povoľ
|
||||
enabled: Povolené
|
||||
enabled_msg: Emoji bolo úspešne povolené
|
||||
image_hint: PNG do 50KB
|
||||
list: Zoznam
|
||||
listed: V zozname
|
||||
new:
|
||||
|
|
|
|||
|
|
@ -252,7 +252,6 @@ sl:
|
|||
enable: Omogoči
|
||||
enabled: Omogočeno
|
||||
enabled_msg: Ta emotikon je uspešno omogočen
|
||||
image_hint: PNG do 50KB
|
||||
list: Seznam
|
||||
listed: Navedeno
|
||||
new:
|
||||
|
|
|
|||
|
|
@ -373,7 +373,6 @@ sq:
|
|||
enable: Aktivizoje
|
||||
enabled: I aktivizuar
|
||||
enabled_msg: Ai emoxhi u aktivizua me sukses
|
||||
image_hint: PNG deri 50KB
|
||||
list: Vëre në listë
|
||||
listed: Në listë
|
||||
new:
|
||||
|
|
|
|||
|
|
@ -109,7 +109,6 @@ sr-Latn:
|
|||
emoji: Emotikon
|
||||
enable: Omogući
|
||||
enabled_msg: Emotikon uspešno omogućen
|
||||
image_hint: PNG do 50KB
|
||||
listed: Izlistan
|
||||
new:
|
||||
title: Dodaj novi proizvoljni emotikon
|
||||
|
|
|
|||
|
|
@ -170,7 +170,6 @@ sr:
|
|||
emoji: Емоџи
|
||||
enable: Омогући
|
||||
enabled_msg: Емоџи успешно омогућен
|
||||
image_hint: PNG до 50KB
|
||||
listed: Излистан
|
||||
new:
|
||||
title: Додај нови произвољни емоџи
|
||||
|
|
|
|||
|
|
@ -330,7 +330,6 @@ sv:
|
|||
enable: Aktivera
|
||||
enabled: Aktiverad
|
||||
enabled_msg: Aktiverade den emoji utan problem
|
||||
image_hint: PNG upp till 50KB
|
||||
list: Lista
|
||||
listed: Noterade
|
||||
new:
|
||||
|
|
|
|||
|
|
@ -354,7 +354,6 @@ th:
|
|||
enable: เปิดใช้งาน
|
||||
enabled: เปิดใช้งานอยู่
|
||||
enabled_msg: เปิดใช้งานอีโมจินั้นสำเร็จ
|
||||
image_hint: PNG สูงสุด 50KB
|
||||
list: แสดงรายการ
|
||||
listed: อยู่ในรายการ
|
||||
new:
|
||||
|
|
|
|||
|
|
@ -373,7 +373,6 @@ tr:
|
|||
enable: Etkinleştir
|
||||
enabled: Etkin
|
||||
enabled_msg: Bu emojiyi başarıyla etkinleştirdi
|
||||
image_hint: 50 KB'a kadar PNG
|
||||
list: Liste
|
||||
listed: Listelenen
|
||||
new:
|
||||
|
|
|
|||
|
|
@ -368,7 +368,6 @@ uk:
|
|||
enable: Увімкнути
|
||||
enabled: Увімкнено
|
||||
enabled_msg: Емодзі успішно увімкнене
|
||||
image_hint: PNG розміром до 50 КБ
|
||||
list: Список
|
||||
listed: У списку
|
||||
new:
|
||||
|
|
|
|||
|
|
@ -367,7 +367,6 @@ vi:
|
|||
enable: Cho phép
|
||||
enabled: Đã cho phép
|
||||
enabled_msg: Đã cho phép thành công Emoji này
|
||||
image_hint: PNG tối đa 50KB
|
||||
list: Danh sách
|
||||
listed: Liệt kê
|
||||
new:
|
||||
|
|
|
|||
|
|
@ -364,7 +364,6 @@ zh-CN:
|
|||
enable: 启用
|
||||
enabled: 已启用
|
||||
enabled_msg: 表情启用成功
|
||||
image_hint: PNG 格式，最大 50KB
|
||||
list: 列表
|
||||
listed: 已显示
|
||||
new:
|
||||
|
|
|
|||
|
|
@ -344,7 +344,6 @@ zh-HK:
|
|||
enable: 啟用
|
||||
enabled: 已啟用
|
||||
enabled_msg: 已啟用表情符號
|
||||
image_hint: PNG 格式，最大 50KB
|
||||
list: 列出
|
||||
listed: 已列出
|
||||
new:
|
||||
|
|
|
|||
|
|
@ -367,7 +367,6 @@ zh-TW:
|
|||
enable: 啟用
|
||||
enabled: 已啟用
|
||||
enabled_msg: 已啟用表情符號
|
||||
image_hint: PNG 格式, 最大 50KB
|
||||
list: 列表
|
||||
listed: 已顯示
|
||||
new:
|
||||
|
|
|
|||
Loading…
Reference in New Issue