fix conflicts

src/lang/th.rs

@@ -477,6 +477,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Empty Username", ""),
         ("Empty Password", ""),
         ("Me", ""),
+        ("identical_file_tip", ""),
         ("Show monitors in menu bar", ""),
     ].iter().cloned().collect();
 }