diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-11-20 15:36:09 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-11-20 15:36:09 +0100 |
| commit | ff67385cfbfd6f5403b2f8b58407dc730dc7e694 (patch) | |
| tree | a8a0df2129a863a739dda6399352d64af811110e /config/locales/de.yml | |
| parent | 707c4918b21d19dd53b64120dbc7263f45fc5ecd (diff) | |
| parent | 8dfc45f757ed8995be0d16e88a1f1d6514dae677 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - README.md discarded upstream changes - app/controllers/api/v1/bookmarks_controller.rb finally merged upstream, some code style fixes and slightly changed pagination code - app/controllers/application_controller.rb changed upstream to always return HTML error pages slight conflict caused by theming code - app/models/bookmark.rb finally merged upstream, no real conflict - spec/controllers/api/v1/bookmarks_controller_spec.rb finally merged upstream, slightly changed pagination code
Diffstat (limited to 'config/locales/de.yml')
| -rw-r--r-- | config/locales/de.yml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/config/locales/de.yml b/config/locales/de.yml index 77c66fb71..490ee947e 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -11,6 +11,7 @@ de: apps: Mobile Apps apps_platforms: Benutze Mastodon auf iOS, Android und anderen Plattformen browse_directory: Durchsuche das Profilverzeichnis und filtere nach Interessen + browse_local_posts: Durchsuche einen Live-Stream von öffentlichen Beiträgen von diesem Server browse_public_posts: Stöbere durch öffentliche Beiträge auf Mastodon contact: Kontakt contact_missing: Nicht angegeben @@ -175,6 +176,7 @@ de: user: Nutzer salmon_url: Salmon-URL search: Suche + search_same_ip: Andere Benutzer mit derselben IP shared_inbox_url: Geteilte Posteingang-URL show: created_reports: Erstellte Meldungen @@ -575,6 +577,7 @@ de: confirmation_dialogs: Bestätigungsfenster discovery: Entdecken sensitive_content: Heikle Inhalte + toot_layout: Beitragslayout application_mailer: notification_preferences: Ändere E-Mail-Einstellungen salutation: "%{name}," |