From b3f8e165bbc2dfdbdd18c2377264fc1d783d6f48 Mon Sep 17 00:00:00 2001
From: Francesco Frison <cescofry@gmail.com>
Date: Fri, 28 Jun 2013 11:23:41 +0100
Subject: [PATCH] porting of iOS/Andorid name while merging LAng files

---
 Strings/ZFLangFile.m | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Strings/ZFLangFile.m b/Strings/ZFLangFile.m
index c59cd2e..dae2f2f 100644
--- a/Strings/ZFLangFile.m
+++ b/Strings/ZFLangFile.m
@@ -134,6 +134,7 @@ - (BOOL)mergeWithFile:(ZFLangFile *)file {
         [self.iOStranslations setObject:obj forKey:key];
         mergeIOS = YES;
     }];
+    if (!self.iOSName && file.iOSName) self.iOSName = file.iOSName;
     
     __block BOOL mergeAndroid = NO;
     [file.androidTranslations enumerateKeysAndObjectsUsingBlock:^(NSString *key, NSDictionary *obj, BOOL *stop) {
@@ -143,6 +144,10 @@ - (BOOL)mergeWithFile:(ZFLangFile *)file {
         mergeAndroid = YES;
     }];
     
+    
+    if (!self.androidName && file.androidName) self.androidName = file.androidName;
+    
+    
     BOOL didMerge = (mergeIOS || mergeAndroid);
     if (didMerge) {
         self.allKeys = nil;