[dreamwidth/dw-free] 72aaac: don't readd keys that were deadphrased

[github]

Branch: refs/heads/develop
Home: https://github.com/dreamwidth/dw-free
Commit: 72aaac36306fd501894642d144a1a6c2b57bb2e0
https://github.com/dreamwidth/dw-free/commit/72aaac36306fd501894642d144a1a6c2b57bb2e0
Author: Kareila <kareila@dreamwidth.org>
Date: 2016-09-19 (Mon, 19 Sep 2016)

Changed paths:
M bin/upgrading/en.dat
M htdocs/manage/circle/edit.bml.text

Log Message:
-----------
don't readd keys that were deadphrased

I noticed that the same keys were being removed every time
I ran texttool.pl on my dreamhack.

There is also a corresponding fix in dw-nonfree.


Commit: 5a282c4736b1f8387c8f34f1a5f04835c740292c
https://github.com/dreamwidth/dw-free/commit/5a282c4736b1f8387c8f34f1a5f04835c740292c
Author: Mark Smith <mark@qq.is>
Date: 2016-09-26 (Mon, 26 Sep 2016)

Changed paths:
M bin/upgrading/en.dat
M htdocs/manage/circle/edit.bml.text

Log Message:
-----------
Merge pull request #1872 from kareila/cleanup-2016q3

don't readd keys that were deadphrased


Compare: https://github.com/dreamwidth/dw-free/compare/d55a360b62ce...5a282c4736b1