fix conflicts

src/lang/ca.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();
 }

src/lang/cn.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();
 }

src/lang/cs.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();
 }

src/lang/da.rs

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

src/lang/de.rs

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

src/lang/el.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();
 }

src/lang/en.rs

@@ -52,5 +52,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("empty_favorite_tip", "No favorite peers yet?\nLet's find someone to connect with and add it to your favorites!"),
         ("empty_lan_tip", "Oh no, it looks like we haven't discovered any peers yet."),
         ("empty_address_book_tip", "Oh dear, it appears that there are currently no peers listed in your address book."),
+        ("identical_file_tip", "This file is identical with the peer's one."),
         ].iter().cloned().collect();
 }

src/lang/eo.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();
 }

src/lang/es.rs

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

src/lang/fa.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();
 }

src/lang/fr.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();
 }

src/lang/hu.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();
 }

src/lang/id.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();
 }

src/lang/it.rs

@@ -477,6 +477,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Empty Username", "Nome Utente Vuoto"),
         ("Empty Password", "Password Vuota"),
         ("Me", "Io"),
+        ("identical_file_tip", "Questo file è identico a quello del peer."),
         ("Show monitors in menu bar", "Mostra schermi nella barra di menù"),
     ].iter().cloned().collect();
 }

src/lang/ja.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();
 }

src/lang/ko.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();
 }

src/lang/kz.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();
 }

src/lang/nl.rs

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

src/lang/pl.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();
 }

src/lang/pt_PT.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();
 }

src/lang/ptbr.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();
 }

src/lang/ro.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();
 }

src/lang/ru.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();
 }

src/lang/sk.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();
 }

src/lang/sl.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();
 }

src/lang/sq.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();
 }

src/lang/sr.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();
 }

src/lang/sv.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();
 }

src/lang/template.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();
 }

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();
 }

src/lang/tr.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();
 }

src/lang/tw.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();
 }

src/lang/ua.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();
 }

src/lang/vn.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();
 }