Merge branch 'Translation27DE' of https://github.com/Mechtilde/gnucash into unstable

Browse Source

Resolved conflicts:
	po/de.po

Note: it took several attempts to get this merge right. In the end I used
git mergetool (with kdiff3 as backend), then chose to take the remote end
(C in kdiff3) for all changes (conflicting or not) and then went back to
the goffice strings and changed each resolved conflict in the goffice strings
to the HEAD version (B in kdiff3). This worked because both Mechtilde's po
file and the one in unstable were merged against the same po file and I
was only interested in overriding goffice translations where Mechtilde's
translation differed from the one imported before by script. And even then
I had one more error to fix in line 430 (where msgstring appeared on two
consecutive rows). I'm mainly adding this info a reference in case we
see similar merge conflicts from future translations.

pull/259/merge

Geert Janssens 8 years ago

parent 8900b19da3 c935fdfd8e

commit 3c1dc14d00

1 changed files with 650 additions and 197 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File

847

po/de.po

View File

File diff suppressed because it is too large Load Diff

Write Preview

Loading…

Cancel

Save