Bug #3235
strings gone missing in merge
| Status: | Closed | Start date: | 04/09/2014 | |
|---|---|---|---|---|
| Priority: | High | Due date: | ||
| Assignee: | n8fr8 | % Done: | 0% | |
| Category: | - | |||
| Target version: | v14 - Armadillo's Agram | |||
| Component: |
Description
The string signed_out_prompt_with_error was removed and not re-added during the restructure.
commits in question:
dceb7 is the merge commit for 82cb2
This was discovered after merging pull requests 426 , 427 and 435
You can see the merge conflicts fixes in https://github.com/abeluck/ChatSecureAndroid)
History
#1 Updated by n8fr8 almost 4 years ago
- Status changed from New to In Progress
Hmm... sorting this out, and thanks for running through all of these.
At this point, my res/value/strings.xml in master seems to have all the necessary entries, though I am checking through it again. There were definitely some issues in my dev_dup_fixes branch, so I went back to what was in master, and the build (and my testing of the build) seem to not have any missing string issues.
#2 Updated by n8fr8 over 2 years ago
- Status changed from In Progress to Resolved
#3 Updated by n8fr8 over 2 years ago
- Status changed from Resolved to Closed