026a56c - Fix conflicts with kde-l10n (#457503)

Authored and Committed by Marcin Garski 15 years ago
    - Fix conflicts with kde-l10n (#457503)
    
        
file modified
+15 -9