-
Notifications
You must be signed in to change notification settings - Fork 292
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3884 from wireapp/staging
release 2018-07-03
- Loading branch information
Showing
180 changed files
with
3,573 additions
and
2,147 deletions.
There are no files selected for viewing
This file contains 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 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 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 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 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 |
---|---|---|
@@ -0,0 +1,33 @@ | ||
<div id="icons"> | ||
<add-participants-icon></add-participants-icon> | ||
<archive-icon></archive-icon> | ||
<arrow-left-icon></arrow-left-icon> | ||
<block-icon></block-icon> | ||
<camera-icon></camera-icon> | ||
<check-icon></check-icon> | ||
<chevron-icon></chevron-icon> | ||
<close-icon></close-icon> | ||
<copy-icon></copy-icon> | ||
<delete-icon></delete-icon> | ||
<devices-icon></devices-icon> | ||
<disclose-icon></disclose-icon> | ||
<edit-icon></edit-icon> | ||
<fullscreen-icon></fullscreen-icon> | ||
<group-icon></group-icon> | ||
<guest-icon></guest-icon> | ||
<hangup-icon></hangup-icon> | ||
<link-icon></link-icon> | ||
<leave-icon></leave-icon> | ||
<message-icon></message-icon> | ||
<micoff-icon></micoff-icon> | ||
<minus-icon></minus-icon> | ||
<mute-icon></mute-icon> | ||
<people-icon></people-icon> | ||
<pickup-icon></pickup-icon> | ||
<plus-icon></plus-icon> | ||
<profile-icon></profile-icon> | ||
<screenshare-icon></screenshare-icon> | ||
<settings-icon></settings-icon> | ||
<undo-icon></undo-icon> | ||
<verified-icon class="override-color"></verified-icon> | ||
</div> |
This file contains 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 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 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 |
---|---|---|
|
@@ -21,7 +21,7 @@ | |
"accountForm.emailTeamPlaceholder": "[email protected]", | ||
"accountForm.emailPersonalPlaceholder": "[email protected]", | ||
"accountForm.passwordPlaceholder": "Passwort (min. acht Zeichen)", | ||
"accountForm.terms": "Ich akzeptiere die <a {linkParams}>Nutzungbedingungen</a>", | ||
"accountForm.terms": "Ich akzeptiere die <a {linkParams}>Nutzungsbedingungen</a>", | ||
"accountForm.submitButton": "Weiter", | ||
"createAccount.nextButton": "Weiter", | ||
"invite.nextButton": "Weiter", | ||
|
@@ -45,7 +45,7 @@ | |
"acceptNewsModal.headline": "Möchtest du Neuigkeiten und Informationen zu Produktupdates von Wire per E-Mail erhalten?", | ||
"acceptNewsModal.unsubscribeDescription": "Du kannst dich jederzeit abmelden.", | ||
"acceptNewsModal.privacyDescription": "Lies unsere <b>Datenschutzerklärung</b>.", | ||
"acceptNewsModal.declineButton": "Ablehnen", | ||
"acceptNewsModal.declineButton": "Nein, danke", | ||
"acceptNewsModal.confirmButton": "Annehmen", | ||
"unsupported.headlineBrowser": "Dieser Browser wird nicht unterstützt.", | ||
"unsupported.subheadBrowser": "Lade die neueste Version von <b style=\"font-weight: 600\">Google Chrome, Mozilla Firefox, Opera</b> oder <b style=\"font-weight: 600\">Microsoft Edge</b> herunter.", | ||
|
@@ -109,6 +109,7 @@ | |
"ValidationError.FIELD.NAME.PATTERN_MISMATCH": "Gib einen Namen mit mindestens zwei Zeichen ein", | ||
"ValidationError.FIELD.NAME.VALUE_MISSING": "Gib einen Namen mit mindestens zwei Zeichen ein", | ||
"ValidationError.FIELD.PASSWORD.PATTERN_MISMATCH": "Wähle ein Passwort mit mindestens acht Zeichen", | ||
"ValidationError.FIELD.PASSWORD_LOGIN.PATTERN_MISMATCH": "Falsches Passwort. Bitte versuche es erneut.", | ||
"ValidationError.FIELD.EMAIL.TYPE_MISMATCH": "Bitte gib eine gültige E-Mail-Adresse ein", | ||
"login.subhead": "Gib deine E-Mail-Adresse oder Benutzernamen ein.", | ||
"login.emailPlaceholder": "E-Mail oder Benutzername", | ||
|
This file contains 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 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 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 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 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 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 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 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 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.