← Back to branch summary

~ubuntu-branches/ubuntu/trusty/cheese/trusty

« back to all changes in this revision

Viewing changes to help/de/pref-flash.page

  • Committer: Package Import Robot
  • Author(s): Artur Rona
  • Date: 2013-12-15 04:02:52 UTC
  • mfrom: (1.6.4) (7.1.22 sid)
  • Revision ID: package-import@ubuntu.com-20131215040252-ofr61hte3zjvzkld
Tags: 3.10.1-1sid1ubuntu1
https://launchpad.net/bugs/1261080
* Merge from Debian unstable. (LP: #1261080) Remaining changes:
  - debian/cheese-common.install, debian/source_cheese.py:
    + Add Apport hook.
  - debian/control:
    + Bump conflicts/replaces since we didn't take the
      libcheese-gtk-dev/ libcheese-doc split until raring.
    + Build-Depends on good gstreamer plugins instead of bad.
    + Suggest gnome-video-effects-extra, as well.
  - debian/patches/use-plugins-good.patch:
    + The camerabin plugin is part of the good gstreamer plugins
      in Ubuntu.
* debian/patches/fix-help-license.patch,
  debian/patches/fix-um-crop-license.patch:
  - Removed, fixed upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
help/de/pref-flash.page
13
13
      <years>2011</years>
14
14
    </credit>
15
15
    <credit type="author editor">
16
 
      <name>Jekaterina Gerassimowa</name>
 
16
      <name>Ekaterina Gerasimova</name>
17
17
      <email its:translate="no">kittykat3756@gmail.com</email>
18
18
    </credit>
19
19
 
 
20
    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
 
21
 
20
22
    <desc>Abschalten des Aufleuchten des Bildschirms bei der Aufnahme eines Fotos.</desc>
21
23
  
22
24
    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
42
44
      <mal:email>christian.kirbach@gmail.com</mal:email>
43
45
      <mal:years>2013</mal:years>
44
46
    </mal:credit>
 
47
  
 
48
    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
 
49
      <mal:name>Tobias Endrigkeit</mal:name>
 
50
      <mal:email>tobiasendrigkeit@outlook.com</mal:email>
 
51
      <mal:years>2013</mal:years>
 
52
    </mal:credit>
45
53
  </info>
46
54
 
47
55
  <title>Den Blitz deaktivieren</title>