1256432 - Unfork account.xml

Status: RESOLVED FIXED

(Chat Core :: General, defect)

Description

[aleth [:aleth]]

I wanted to add bug 955413 to TB as well and noticed this file is pointlessly forked (the only differences are a bugfix that is missing in TB and a single line of code).

Comment 1

[aleth [:aleth]]

Attachment: Unfork account.xml

Comment 2

[aleth [:aleth]]

Attachment: Unfork accounts.dtd

Comment 3

[Patrick Cloke [:clokep]]

Comment on attachment 8730406 [details] [diff] [review]
Unfork accounts.dtd

Review of attachment 8730406 [details] [diff] [review]:
-----------------------------------------------------------------

::: chat/locales/en-US/accounts.dtd
@@ +7,4 @@
>  <!ENTITY accountManager.width                "450">
> +<!-- Account manager window for Thunderbird -->
> +<!ENTITY accountsWindow.title                "Instant messaging status">
> +<!ENTITY accountsWindow2.style               "width: 41em; height: 27em;">

I'd like Florian's opinion on this.

Comment 4

[aleth [:aleth]]

Attachment: Unfork accounts.dtd

Typo fix

Comment 5

[Florian Quèze [:florian]]

Comment on attachment 8730422 [details] [diff] [review]
Unfork accounts.dtd

Review of attachment 8730422 [details] [diff] [review]:
-----------------------------------------------------------------

::: chat/locales/en-US/accounts.dtd
@@ +15,5 @@
>  <!ENTITY accountManager.close.accesskey      "l">
>  <!-- This should match account.commandkey in instantbird.dtd -->
>  <!ENTITY accountManager.close.commandkey     "a">
>  <!-- This title must be short, displayed with a big font size -->
> +<!ENTITY accountManager.noAccount.title      "No account configured yet">

I'm not sure what the point of this change is, but it's fine with me either way.

Comment 6

[aleth [:aleth]]

(In reply to Florian Quèze [:florian] [:flo] from comment #5)
> >  <!-- This title must be short, displayed with a big font size -->
> > +<!ENTITY accountManager.noAccount.title      "No account configured yet">
> 
> I'm not sure what the point of this change is, but it's fine with me either
> way.

There's no point, that's just the version of the string from TB.

Comment 7

[aleth [:aleth]]

https://hg.mozilla.org/comm-central/rev/d9cc74deecf621f5e20b701080dc69e7d8564dc2
Bug 1256432 - Unfork account.xml. r=clokep

https://hg.mozilla.org/comm-central/rev/e082a51dfcd01ca4c873b77b12209109fe9febaf
Bug 1256432 - Unfork accounts.dtd. r=clokep