resolve conflict, apply reviewer changes

frappe/__init__.py

@@ -48,7 +48,7 @@ def _(msg, lang=None):
 	# msg should always be unicode
 	msg = as_unicode(msg).strip()
 
-	# retrun lang_full_dict according to lang passed parameter
+	# return lang_full_dict according to lang passed parameter
 	return get_full_dict(lang).get(msg) or msg
 
 def as_unicode(text, encoding='utf-8'):

frappe/translate.py

@@ -178,6 +178,7 @@ def get_full_dict(lang):
 	if not lang:
 		return {}
 
+	# found in local, return!
 	if getattr(frappe.local, 'lang_full_dict', {}).get(lang, None):
 		return frappe.local.lang_full_dict