Ignore:
Timestamp:
May 30, 2012 11:37:44 AM (3 years ago)
Author:
yomguy <yomguy@…>
Branches:
master, crem, crem2, crem3, dev, dev2, diadems, dj1.6, feature/breadcrumbs, feature/ts-0.5, feature/ts-0.5.4, feature/writecache, generic, lam, lam2, mapsv3, merge, nlivemulti, release/1.4.4, sabiod, search, server, storage, telecaster
Children:
64bc9e8
Parents:
efa5176 (diff), c2c51a8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
git-author:
yomguy <yomguy@…> (30/05/2012 11:37:44)
git-committer:
yomguy <yomguy@…> (30/05/2012 11:37:44)
Message:

Merge branch 'develop' into lam

File:
1 edited

Legend:

Unmodified
Added
Removed
  • telemeta/locale/de/LC_MESSAGES/django.po

    r3f7636a rc2c51a8  
    99"Project-Id-Version: PACKAGE VERSION\n" 
    1010"Report-Msgid-Bugs-To: \n" 
    11 "POT-Creation-Date: 2012-05-30 10:27+0200\n" 
     11"POT-Creation-Date: 2012-05-30 11:37+0200\n" 
    1212"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 
    1313"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 
     
    126126msgstr "" 
    127127 
     128#: models/enum.py:228 models/media.py:320 
     129msgid "domain" 
     130msgstr "" 
     131 
    128132#: models/format.py:58 models/media.py:390 models/media.py:449 
    129133#: models/media.py:459 models/media.py:470 models/media.py:486 
     
    472476#: models/media.py:319 
    473477msgid "scientist" 
    474 msgstr "" 
    475  
    476 #: models/media.py:320 
    477 msgid "domain" 
    478478msgstr "" 
    479479 
Note: See TracChangeset for help on using the changeset viewer.