-
Notifications
You must be signed in to change notification settings - Fork 237
Sync Strings #4804
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Sync Strings #4804
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,18 +1,18 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> | ||
<string name="screen_decline_and_block_block_user_option_description">"Sie werden keine Nachrichten oder Chatroomeinladungen von diesem Benutzer sehen."</string> | ||
<string name="screen_decline_and_block_block_user_option_description">"Sie werden keine Nachrichten oder Chateinladungen von diesem Nutzer sehen."</string> | ||
<string name="screen_decline_and_block_block_user_option_title">"Benutzer blockieren"</string> | ||
<string name="screen_decline_and_block_report_user_option_description">"Melden Sie diesen Raum Ihrem Kontoanbieter."</string> | ||
<string name="screen_decline_and_block_report_user_reason_placeholder">"Beschreiben Sie den Grund für die Meldung…"</string> | ||
<string name="screen_decline_and_block_report_user_reason_placeholder">"Nennen Sie den Grund für die Meldung…"</string> | ||
<string name="screen_decline_and_block_title">"Ablehnen und blockieren"</string> | ||
<string name="screen_invites_decline_chat_message">"Möchten Sie die Einladung zum Betreten von %1$s wirklich ablehnen?"</string> | ||
<string name="screen_invites_decline_chat_title">"Einladung ablehnen"</string> | ||
<string name="screen_invites_decline_direct_chat_message">"Möchten Sie diesen privaten Chat mit %1$s wirklich ablehnen?"</string> | ||
<string name="screen_invites_decline_direct_chat_title">"Einladung ablehnen"</string> | ||
<string name="screen_invites_empty_list">"Keine Einladungen"</string> | ||
<string name="screen_invites_invited_you">"%1$s (%2$s) hat dich eingeladen"</string> | ||
<string name="screen_join_room_decline_and_block_alert_confirmation">"Ja, ablehnen und blockieren"</string> | ||
<string name="screen_join_room_decline_and_block_alert_confirmation">"Ja, ablehnen & blockieren"</string> | ||
<string name="screen_join_room_decline_and_block_alert_message">"Sind Sie sicher, dass Sie die Einladung zu diesem Raum ablehnen möchten? Dadurch wird auch verhindert, dass %1$s Sie kontaktiert oder in Räume einlädt."</string> | ||
<string name="screen_join_room_decline_and_block_alert_title">"Einladung ablehnen und blockieren"</string> | ||
<string name="screen_join_room_decline_and_block_alert_title">"Einladung ablehnen & Nutzer blockieren"</string> | ||
<string name="screen_join_room_decline_and_block_button_title">"Ablehnen und blockieren"</string> | ||
</resources> |
22 changes: 11 additions & 11 deletions
22
features/joinroom/impl/src/main/res/values-de/translations.xml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,32 +1,32 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> | ||
<string name="screen_join_room_ban_by_message">"Sie wurden aus diesem Chatroom ausgeschlossen %1$s."</string> | ||
<string name="screen_join_room_ban_message">"Sie wurden aus diesem Chatroom verbannt"</string> | ||
<string name="screen_join_room_ban_by_message">"Sie wurden von %1$s für diesen Chatroom gesperrt."</string> | ||
<string name="screen_join_room_ban_message">"Sie wurden für diesen Chatroom gesperrt"</string> | ||
<string name="screen_join_room_ban_reason">"Grund:%1$s."</string> | ||
<string name="screen_join_room_cancel_knock_action">"Anfrage abbrechen"</string> | ||
<string name="screen_join_room_cancel_knock_alert_confirmation">"Ja, abbrechen"</string> | ||
<string name="screen_join_room_cancel_knock_alert_description">"Möchten Sie Ihre Beitrittsanfrage für diesen Chatroom wirklich stornieren?"</string> | ||
<string name="screen_join_room_cancel_knock_alert_title">"Beitrittsanfrage stornieren"</string> | ||
<string name="screen_join_room_decline_and_block_alert_confirmation">"Ja, ablehnen und blockieren"</string> | ||
<string name="screen_join_room_decline_and_block_alert_confirmation">"Ja, ablehnen & blockieren"</string> | ||
<string name="screen_join_room_decline_and_block_alert_message">"Sind Sie sicher, dass Sie die Einladung zu diesem Raum ablehnen möchten? Dadurch wird auch verhindert, dass %1$s Sie kontaktiert oder in Räume einlädt."</string> | ||
<string name="screen_join_room_decline_and_block_alert_title">"Einladung ablehnen und blockieren"</string> | ||
<string name="screen_join_room_decline_and_block_alert_title">"Einladung ablehnen & Nutzer blockieren"</string> | ||
<string name="screen_join_room_decline_and_block_button_title">"Ablehnen und blockieren"</string> | ||
<string name="screen_join_room_fail_message">"Der Beitritt zum Chatroom schlug fehl."</string> | ||
<string name="screen_join_room_fail_reason">"Dieser Chatroom ist entweder nur auf Einladung zugänglich oder es kann zu Zugangsbeschränkungen auf Spaceebene kommen."</string> | ||
<string name="screen_join_room_fail_reason">"Dieser Chatroom ist entweder nur auf Einladung zugänglich oder es gibt andere Zugangsbeschränkungen durch Spaces."</string> | ||
<string name="screen_join_room_forget_action">"Vergessen Sie diesen Raum"</string> | ||
<string name="screen_join_room_invite_required_message">"Sie benötigen eine Einladung, um diesem Raum beizutreten"</string> | ||
<string name="screen_join_room_invite_required_message">"Sie benötigen eine Einladung, um diesem Chatroom zu betreten"</string> | ||
<string name="screen_join_room_join_action">"Raum beitreten"</string> | ||
<string name="screen_join_room_join_restricted_message">"Möglicherweise müssen Sie eingeladen sein oder Mitglied eines Spaces sein, um beitreten zu können."</string> | ||
<string name="screen_join_room_knock_action">"Anklopfen"</string> | ||
<string name="screen_join_room_knock_message_description">"Nachricht (optional)"</string> | ||
<string name="screen_join_room_knock_sent_description">"Falls Ihre Anfrage, dem Raum beizutreten, akzeptiert wird, werden Sie eine Einladung erhalten."</string> | ||
<string name="screen_join_room_knock_sent_description">"Falls Ihre Anfrage, den Raum zu betreten, akzeptiert wird, erhalten Sie eine Einladung."</string> | ||
<string name="screen_join_room_knock_sent_title">"Beitrittsanfrage geschickt"</string> | ||
<string name="screen_join_room_loading_alert_message">"Wir konnten die Chatroomvorschau nicht anzeigen. Dies kann an Netzwerk- oder Serverproblemen liegen."</string> | ||
<string name="screen_join_room_loading_alert_title">"Wir konnten diese Chatroomvorschau nicht anzeigen"</string> | ||
<string name="screen_join_room_space_not_supported_description">"%1$s unterstützt noch keine Spaces. Du kannst auf Spaces im Web zugreifen."</string> | ||
<string name="screen_join_room_space_not_supported_description">"%1$s unterstützt noch keine Spaces. Sie können auf Spaces im Web zugreifen."</string> | ||
<string name="screen_join_room_space_not_supported_title">"Spaces werden noch nicht unterstützt"</string> | ||
<string name="screen_join_room_subtitle_knock">"Klopfe an um einen Administrator zu benachrichtigen. Nach der Freigabe kannst du dich an der Unterhaltung beteiligen."</string> | ||
<string name="screen_join_room_subtitle_no_preview">"Du musst Mitglied in diesem Raum sein, um den Nachrichtenverlauf zu sehen."</string> | ||
<string name="screen_join_room_title_knock">"Willst du diesem Raum beitreten?"</string> | ||
<string name="screen_join_room_subtitle_knock">"Klicken Sie auf die Schaltfläche unten und ein Chatroomadministrator wird benachrichtigt. Nach der Freigabe durch einen Chatroomadministrator können Sie sich an der Unterhaltung beteiligen."</string> | ||
<string name="screen_join_room_subtitle_no_preview">"Sie müssen Mitglied in diesem Chatroom sein, um den Nachrichtenverlauf einsehen zu können."</string> | ||
<string name="screen_join_room_title_knock">"Möchten Sie diesem Chatroom betreten?"</string> | ||
<string name="screen_join_room_title_no_preview">"Vorschau nicht verfügbar"</string> | ||
</resources> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's weird that they removed the 'or administrator' part here.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi, that would probably be me, I cleaned up more than a 100 strings, making the wording more consistent (use the same terms).
This specific change is probably a debatable change, but admin>moderator, so "a moderator" implies someone more important than a aregular member. German is such a long languages that many dialogs were overflowing or cutoff, so taking some shortcuts seemed acceptable.
On the plus side, some external reviewer seems to have OK'd my proposal :-)