Regenerate i18n due to conflicts

This commit is contained in:
Travis Ralston 2019-01-25 09:12:45 -07:00
parent f7f23e4dea
commit 3e69be5139

View File

@ -1087,7 +1087,6 @@
"Room contains unknown devices": "Room contains unknown devices", "Room contains unknown devices": "Room contains unknown devices",
"\"%(RoomName)s\" contains devices that you haven't seen before.": "\"%(RoomName)s\" contains devices that you haven't seen before.", "\"%(RoomName)s\" contains devices that you haven't seen before.": "\"%(RoomName)s\" contains devices that you haven't seen before.",
"Unknown devices": "Unknown devices", "Unknown devices": "Unknown devices",
"Security & Privacy": "Security & Privacy",
"Visit old settings": "Visit old settings", "Visit old settings": "Visit old settings",
"Unable to load backup status": "Unable to load backup status", "Unable to load backup status": "Unable to load backup status",
"Unable to restore backup": "Unable to restore backup", "Unable to restore backup": "Unable to restore backup",
@ -1321,15 +1320,11 @@
"Key Backup": "Key Backup", "Key Backup": "Key Backup",
"Ignored Users": "Ignored Users", "Ignored Users": "Ignored Users",
"Submit Debug Logs": "Submit Debug Logs", "Submit Debug Logs": "Submit Debug Logs",
"Riot collects anonymous analytics to allow us to improve the application.": "Riot collects anonymous analytics to allow us to improve the application.",
"Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.",
"Learn more about how we use analytics.": "Learn more about how we use analytics.",
"These are experimental features that may break in unexpected ways": "These are experimental features that may break in unexpected ways", "These are experimental features that may break in unexpected ways": "These are experimental features that may break in unexpected ways",
"Use with caution": "Use with caution", "Use with caution": "Use with caution",
"Deactivate my account": "Deactivate my account", "Deactivate my account": "Deactivate my account",
"Clear Cache": "Clear Cache", "Clear Cache": "Clear Cache",
"Updates": "Updates", "Updates": "Updates",
"Reject all %(invitedRooms)s invites": "Reject all %(invitedRooms)s invites",
"Bulk Options": "Bulk Options", "Bulk Options": "Bulk Options",
"Desktop specific": "Desktop specific", "Desktop specific": "Desktop specific",
"Missing Media Permissions, click here to request.": "Missing Media Permissions, click here to request.", "Missing Media Permissions, click here to request.": "Missing Media Permissions, click here to request.",