apply latest changes from  Archaeopteryx [:aryx]

see http://hg.mozilla.org/releases/gaia-l10n/v1_2/de/rev/0e05a3e4bdd8