Ubuntu Documentation

Merge lp:~carsteng/ubuntu-docs/trusty into lp:ubuntu-docs/trusty

  1. trusty
  2. Merge into trusty
Proposed by Carsten Gerlach
Status: Merged
Approved by: Doug Smythies
Approved revision: 399
Merged at revision: 399
Proposed branch: lp:~carsteng/ubuntu-docs/trusty
Merge into: lp:ubuntu-docs/trusty
Diff against target: 8 lines (+0/-0)
0 files modified
To merge this branch: bzr merge lp:~carsteng/ubuntu-docs/trusty
Reviewer Review Type Date Requested Status
Doug Smythies Approve
Review via email: mp+213143@code.launchpad.net

Description of the change

four sreenshots for the German translation

To post a comment you must log in.
Revision history for this message
Doug Smythies (dsmythies) wrote :

Thank you for the new region specific ubuntu-help/de/figures/color-profile-default.png and the modified ubuntu-help/de/figures/nautilus.png.

The other two files: ubuntu-help/de/figures/input-preferences.png (New) and ubuntu-help/de/figures/nautilus-icons.png (Modified) are byte for byte identical to the "C" (US-English) version, therefore the region specific one is not required or desired. They will be removed from the merge.

review: Approve
Revision history for this message
Carsten Gerlach (carsteng) wrote :

Hi Doug,

thanks for the approved merge. Sorry for the two identical screenshots from the »C« directory. I thought, we need every screenshot again in the language specific directory. So this means, if a screenschot is not found in the language directory, it is automatically used from the »C« directory for all translations?

Revision history for this message
Doug Smythies (dsmythies) wrote :

Carsten wrote: "So this means, if a screenschot is not found in the language directory, it is automatically used from the »C« directory for all translations?"

Yes.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'ubuntu-help/de/figures/color-profile-default.png'
2Binary files ubuntu-help/de/figures/color-profile-default.png 1970-01-01 00:00:00 +0000 and ubuntu-help/de/figures/color-profile-default.png 2014-03-27 20:37:26 +0000 differ
3=== added file 'ubuntu-help/de/figures/input-preferences.png'
4Binary files ubuntu-help/de/figures/input-preferences.png 1970-01-01 00:00:00 +0000 and ubuntu-help/de/figures/input-preferences.png 2014-03-27 20:37:26 +0000 differ
5=== modified file 'ubuntu-help/de/figures/nautilus-icons.png'
6Binary files ubuntu-help/de/figures/nautilus-icons.png 2011-12-13 04:18:01 +0000 and ubuntu-help/de/figures/nautilus-icons.png 2014-03-27 20:37:26 +0000 differ
7=== modified file 'ubuntu-help/de/figures/nautilus.png'
8Binary files ubuntu-help/de/figures/nautilus.png 2012-04-09 02:34:30 +0000 and ubuntu-help/de/figures/nautilus.png 2014-03-27 20:37:26 +0000 differ

Subscribers

People subscribed via source and target branches