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

« back to all changes in this revision

Viewing changes to help/es/bookmark-edit.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:
24
24
    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
25
25
      <mal:name>Daniel Mustieles</mal:name>
26
26
      <mal:email>daniel.mustieles@gmail.com</mal:email>
27
 
      <mal:years>2013, 2014</mal:years>
 
27
      <mal:years>2013, 2015</mal:years>
28
28
    </mal:credit>
29
29
  
30
30
    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">