~noskcaj/ubuntu/wily/epiphany-browser/merge2

« back to all changes in this revision

Viewing changes to help/de/pref.page

  • Committer: Package Import Robot
  • Author(s): Jackson Doak
  • Date: 2015-06-02 10:42:34 UTC
  • mfrom: (1.10.3) (105.1.15 sid)
  • Revision ID: package-import@ubuntu.com-20150602104234-aud9080wq37exs53
Tags: 3.16.1-1ubuntu1
* Merge from Debian unstable.  Remaining changes:
  - debian/patches/07_bookmarks.patch:
    Add Ubuntu-specific default bookmarks, borrowed from Firefox
  - debian/patches/81_ubuntu_force_update_bookmarks_menu.patch:
    update the bookmarks menu every time the internal structure
    is changed (needed for the indicator application menu to work
    correctly).
  - debian/patches/ubuntu_titlebars.patch: Use traditional titlebars
    for non-GNOME sessions

Show diffs side-by-side

added added

removed removed

Lines of Context:
21
21
    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
22
22
      <mal:name>Christian Kirbach</mal:name>
23
23
      <mal:email>christian.kirbach@gmail.com</mal:email>
24
 
      <mal:years>2013, 2014</mal:years>
 
24
      <mal:years>2013, 2014, 2015</mal:years>
25
25
    </mal:credit>
26
26
  
27
27
    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
28
28
      <mal:name>Benjamin Steinwender</mal:name>
29
29
      <mal:email>b@stbe.at</mal:email>
30
 
      <mal:years>2014</mal:years>
 
30
      <mal:years>2014, 2015</mal:years>
31
31
    </mal:credit>
32
32
  </info>
33
33
 
34
 
  <title>Einstellungen für <app>Webbrowser</app></title>
 
34
  <title>Einstellungen für <app>Internet</app></title>
35
35
 
36
36
  <!-- Preference subpages included here -->
37
37