[pitivi: 4/4] Merging translations



commit 7280cf0c64b46fb2066a00698072c6b3dfada6da
Merge: c316090 a6485ae
Author: Thibault Saunier <thibault saunier collabora com>
Date:   Mon Aug 15 13:34:00 2011 +0200

    Merging translations
    
    Conflicts:
    	po/POTFILES.in

 po/POTFILES.in |   20 +-
 po/es.po       |  980 ++++++++++++++++++++++++++++++++++----------------------
 po/sl.po       |  911 +++++++++++++++++++++++++++++++++-------------------
 3 files changed, 1186 insertions(+), 725 deletions(-)
---



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]