From c40bd7e23593af083e0dcc2175249f6e9ac82494 Mon Sep 17 00:00:00 2001
From: Daniel Gasienica <daniel@signal.org>
Date: Tue, 1 May 2018 14:35:29 -0400
Subject: [PATCH 1/5] Remove unused `retryDescription` localized string

---
 js/views/message_detail_view.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/js/views/message_detail_view.js b/js/views/message_detail_view.js
index c9c2c58fd911..2e9a63456d91 100644
--- a/js/views/message_detail_view.js
+++ b/js/views/message_detail_view.js
@@ -165,7 +165,6 @@
           received: i18n('received'),
           errorLabel: i18n('error'),
           deleteLabel: i18n('deleteMessage'),
-          retryDescription: i18n('retryDescription'),
         })
       );
       this.view.$el.prependTo(this.$('.message-container'));

From e167958135d691b9cffba77e6bb883ce79655245 Mon Sep 17 00:00:00 2001
From: Daniel Gasienica <daniel@signal.org>
Date: Wed, 2 May 2018 11:59:20 -0400
Subject: [PATCH 2/5] Remove unused `messageCaption`

---
 _locales/en/messages.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 5fe98b5639e7..111e06e5eff7 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -338,10 +338,6 @@
       "message": "You don’t have any documents in this conversation",
       "description": "Message shown to user in the media gallery when there are no messages with document attachments (anything other than images or video)"
     },
-    "messageCaption": {
-      "message": "Message caption",
-      "description": "Prefix of attachment alt tags in the media gallery"
-    },
     "today": {
       "message": "Today",
       "description": "Section header in the media gallery"

From c7547228673e6ed2373d3b1e84308b714aca3c9d Mon Sep 17 00:00:00 2001
From: Daniel Gasienica <daniel@signal.org>
Date: Wed, 2 May 2018 12:35:07 -0400
Subject: [PATCH 3/5] Remove documentation about Bower dependencies

We are now using yarn (npm).
---
 CONTRIBUTING.md | 32 --------------------------------
 1 file changed, 32 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 33d931a843d2..0a3072f322c1 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -258,37 +258,5 @@ yarn build-release
 
 Then, run the tests using `grunt test-release:osx --dir=release`, replacing `osx` with `linux` or `win` depending on your platform.
 
-## Dependencies
 
-**Note**: You probably won't end up doing this. Feel free to skip for now.
 
-Dependencies are managed by [bower](http://bower.io) and built with
-[grunt](http://gruntjs.com). To change them, you'll need to install node and
-npm, then run `npm install` to install bower, grunt, and related plugins.
-
-### Adding a bower component
-
-Add the package name and version to bower.json under 'dependencies' or `bower install package-name --save`
-
-Next update the "preen" config in bower.json with the list of files we will
-actually use from the new package, e.g.:
-
-```
-  "preen": {
-    "package-name": [
-      "path/to/main.js",
-      "directory/**/*.js"
-    ],
-    ...
-  }
-```
-
-If you'd like to add the new dependency to js/components.js to be included on
-all html pages, simply append the package name to the concat.app list in
-`bower.json`. Take care to insert it in the order you would like it
-concatenated.
-
-Now, run `grunt` to delete unused package files and build `js/components.js`.
-
-Finally, stage and commit changes to bower.json, `js/components.js`,
-and `components/`. The latter should be limited to files we actually use.

From 10c6561f5bf02d0dab75bf209a8f5e5c100482fe Mon Sep 17 00:00:00 2001
From: Daniel Gasienica <daniel@signal.org>
Date: Wed, 2 May 2018 12:35:23 -0400
Subject: [PATCH 4/5] Document how to pull translations

---
 CONTRIBUTING.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 0a3072f322c1..3778e03784ed 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -258,5 +258,14 @@ yarn build-release
 
 Then, run the tests using `grunt test-release:osx --dir=release`, replacing `osx` with `linux` or `win` depending on your platform.
 
+## Translations
 
+To pull the latest translations, follow these steps:
 
+1.  Download Transifex client:
+    https://docs.transifex.com/client/installing-the-client
+1.  Create Transifex account: https://transifex.com
+1.  Generate API token: https://www.transifex.com/user/settings/api/
+1.  Create `~/.transifexrc` configuration:
+    https://docs.transifex.com/client/client-configuration#-transifexrc
+1.  Run `yarn grunt tx`.

From e010ff30a3dc07e4fdf79e9e8cd087476956d830 Mon Sep 17 00:00:00 2001
From: Daniel Gasienica <daniel@signal.org>
Date: Wed, 2 May 2018 19:13:30 -0400
Subject: [PATCH 5/5] Use sequential numbering for ordered list

Using all `1.` is a workaround to allow reordering large lists without redoing
numbering.
---
 CONTRIBUTING.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3778e03784ed..3f507f7d7158 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -264,8 +264,8 @@ To pull the latest translations, follow these steps:
 
 1.  Download Transifex client:
     https://docs.transifex.com/client/installing-the-client
-1.  Create Transifex account: https://transifex.com
-1.  Generate API token: https://www.transifex.com/user/settings/api/
-1.  Create `~/.transifexrc` configuration:
+2.  Create Transifex account: https://transifex.com
+3.  Generate API token: https://www.transifex.com/user/settings/api/
+4.  Create `~/.transifexrc` configuration:
     https://docs.transifex.com/client/client-configuration#-transifexrc
-1.  Run `yarn grunt tx`.
+5.  Run `yarn grunt tx`.