← Back to branch summary

~ubuntu-branches/ubuntu/saucy/empathy/saucy-updates

« back to all changes in this revision

Viewing changes to help/de/prob-conn.page

  • Committer: Package Import Robot
  • Author(s): Iain Lane
  • Date: 2013-05-31 10:44:31 UTC
  • mfrom: (1.1.111) (6.6.55 experimental)
  • Revision ID: package-import@ubuntu.com-20130531104431-w0ec8ntcojx76y61
Tags: 3.8.3-0ubuntu1
* Merge with Debian, remaining changes:
  - debian/patches/00_linker-fixes.patch
  - debian/patches/10_use_notify_osd_icons.patch
  - debian/patches/23_idomessagedialog_for_voip_and_ft.patch
  - debian/patches/34_start_raised_execpt_in_session.patch
  - debian/patches/38_default_to_facebook_for_im.patch
  - debian/patches/39_default_to_freenode_for_irc.patch
  - debian/patches/41_unity_launcher_progress.patch
  - debian/patches/42_shell_running.patch
  - debian/patches/43_quicklists.patch
  - debian/patches/47_git_activate_with_platform_data.patch: Patches kept,
    see newly completed patch headers for descriptions.
  - debian/*: Turn on UOA and split out account plugins into
    account-plugins-* packages.
  - Remove Universe Build-Deps for geocode and cheese and disable these
    features.
  - debian/indicators/empathy: Install indicator integration point.
* New upstream release 3.8.3
* debian/patches/include-empathy-keyring.h: Add, fix implicit declaration of
  empathy_keyring_set_account_password_finish and co by including the right
  header.

Show diffs side-by-side

added added

removed removed

Lines of Context:
help/de/prob-conn.page
25
25
    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
26
26
      <mal:name>Mario Blättermann</mal:name>
27
27
      <mal:email>mario.blaettermann@gmail.com</mal:email>
28
 
      <mal:years>2008-2012</mal:years>
 
28
      <mal:years>2008-2013</mal:years>
29
29
    </mal:credit>
30
30
  
31
31
    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
36
36
  
37
37
    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
38
38
      <mal:name>Christian Kirbach</mal:name>
39
 
      <mal:email>Christian.Kirbach@googlemail.com</mal:email>
40
 
      <mal:years>2010-2012</mal:years>
 
39
      <mal:email>Christian.Kirbach@gmail.com</mal:email>
 
40
      <mal:years>2010-2013</mal:years>
41
41
    </mal:credit>
42
42
  </info>
43
43