mirrors/catstodon
1
0
Fork 0
mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2024-11-27 02:21:37 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/main' into develop

Browse source
This commit is contained in:
Jeremy Kescher 2022-10-05 17:59:01 +02:00
commit 7d26fee964
No known key found for this signature in database
GPG key ID: 48DFE4BB15BA5940
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/javascript/flavours/glitch/features/local_settings/page/index.js
View file

@ -20,7 +20,7 @@ const messages = defineMessages({
layout_mobile: { id: 'layout.single', defaultMessage: 'Mobile' }, layout_mobile: { id: 'layout.single', defaultMessage: 'Mobile' },
layout_mobile_hint: { id: 'layout.hint.single', defaultMessage: 'Use single-column layout regardless of the “Enable advanced web interface” setting or screen size.' }, layout_mobile_hint: { id: 'layout.hint.single', defaultMessage: 'Use single-column layout regardless of the “Enable advanced web interface” setting or screen size.' },
side_arm_none: { id: 'settings.side_arm.none', defaultMessage: 'None' }, side_arm_none: { id: 'settings.side_arm.none', defaultMessage: 'None' },
side_arm_keep: { id: 'settings.side_arm_reply_mode.keep', defaultMessage: 'Keep secondary toot button to set privacy' }, side_arm_keep: { id: 'settings.side_arm_reply_mode.keep', defaultMessage: 'Keep its set privacy' },
side_arm_copy: { id: 'settings.side_arm_reply_mode.copy', defaultMessage: 'Copy privacy setting of the toot being replied to' }, side_arm_copy: { id: 'settings.side_arm_reply_mode.copy', defaultMessage: 'Copy privacy setting of the toot being replied to' },
side_arm_restrict: { id: 'settings.side_arm_reply_mode.restrict', defaultMessage: 'Restrict privacy setting to that of the toot being replied to' }, side_arm_restrict: { id: 'settings.side_arm_reply_mode.restrict', defaultMessage: 'Restrict privacy setting to that of the toot being replied to' },
regexp: { id: 'settings.content_warnings.regexp', defaultMessage: 'Regular expression' }, regexp: { id: 'settings.content_warnings.regexp', defaultMessage: 'Regular expression' },
@ -292,7 +292,7 @@ class LocalSettingsPage extends React.PureComponent {
]} ]}
onChange={onChange} onChange={onChange}
> >
<FormattedMessage id='settings.side_arm_reply_mode' defaultMessage='When replying to a toot:' /> <FormattedMessage id='settings.side_arm_reply_mode' defaultMessage='When replying to a toot, the secondary toot button should:' />
</LocalSettingsPageItem> </LocalSettingsPageItem>
</div> </div>
), ),

2
app/javascript/flavours/glitch/locales/es.js
View file

@ -91,7 +91,7 @@ const messages = {
'settings.side_arm_reply_mode.copy': 'Copiar opción de privacidad del toot al que estás respondiendo', 'settings.side_arm_reply_mode.copy': 'Copiar opción de privacidad del toot al que estás respondiendo',
'settings.side_arm_reply_mode.keep': 'Conservar opción de privacidad', 'settings.side_arm_reply_mode.keep': 'Conservar opción de privacidad',
'settings.side_arm_reply_mode.restrict': 'Restringir la opción de privacidad a la misma del toot al que estás respondiendo', 'settings.side_arm_reply_mode.restrict': 'Restringir la opción de privacidad a la misma del toot al que estás respondiendo',
'settings.side_arm_reply_mode': 'Al responder a un toot:', 'settings.side_arm_reply_mode': 'Al responder a un toot, el botón de toot secundario debe:',
'settings.side_arm.none': 'Ninguno', 'settings.side_arm.none': 'Ninguno',
'settings.side_arm': 'Botón secundario:', 'settings.side_arm': 'Botón secundario:',
'settings.swipe_to_change_columns': 'Permitir deslizar para cambiar columnas (Sólo en móvil)', 'settings.swipe_to_change_columns': 'Permitir deslizar para cambiar columnas (Sólo en móvil)',