Rebase your work on top of master

.gitmodules

@@ -0,0 +1,24 @@
+[submodule "third-party/dht"]
+	path = third-party/dht
+	url = https://github.com/transmission/dht
+	branch = post-0.24-transmission
+[submodule "third-party/libb64"]
+	path = third-party/libb64
+	url = https://github.com/transmission/libb64
+	branch = post-1.2.1-transmission
+[submodule "third-party/libevent"]
+	path = third-party/libevent
+	url = https://github.com/transmission/libevent
+	branch = post-2.0.22-transmission
+[submodule "third-party/libnatpmp"]
+	path = third-party/libnatpmp
+	url = https://github.com/transmission/libnatpmp
+	branch = post-20151025-transmission
+[submodule "third-party/libutp"]
+	path = third-party/libutp
+	url = https://github.com/transmission/libutp
+	branch = post-3.3-transmission
+[submodule "third-party/miniupnpc"]
+	path = third-party/miniupnpc
+	url = https://github.com/transmission/miniupnpc
+	branch = post-1.9-transmission

.tx/config

@@ -1,7 +1,22 @@
 [main]
 host = https://www.transifex.com
 
-[transmissionbt.transmission-qt]
+[transmissionbt.qt]
 file_filter = qt/translations/transmission_<lang>.ts
 source_lang = en
 type = QT
+
+[transmissionbt.gtk]
+file_filter = po/<lang>.po
+source_lang = en
+type = PO
+
+[transmissionbt.mac]
+file_filter = macosx/<lang>.lproj/Localizable.strings
+source_lang = en
+type = STRINGS
+
+[transmissionbt.mac-ql]
+file_filter = macosx/QuickLookPlugin/<lang>.lproj/Localizable.strings
+source_lang = en
+type = STRINGS

AUTHORS

@@ -1,17 +1,18 @@
 The Transmission Project
-http://www.transmissionbt.com/
+https://transmissionbt.com/
 
 Lead Developers <dev@transmissionbt.com>
   Jordan Lee, Mnemosyne LLC <jordan@transmissionbt.com> (Daemon, Backend, GTK+ client)
   Mitchell Livingston, Digital Ignition LLC <livings124@transmissionbt.com> (Mac OS X client)
+  Mike Gelfand <mike@transmissionbt.com>
 
 Project Contributors
   John Clay <john@transmissionbt.com> (Website maintenance and troubleshooting, Mac OS X help documentation)
   Bruno Bierbaumer (Web client patches)
   Juliusz Chroboczek (DHT, network code, BitTorrent code improvements)
   Daniel Lee (Patches)
   Tomas Carnecky (Profiling, patches, and detection of sneaky bugs)
-  Diego Jim�nez (Patches)
+  Diego Jiménez (Patches)
   Kendall Hopkins <SoftwareElves@gmail.com> (Web client)
   Malcolm Jarvis <mjarvis@transmissionbt.com> (Web client)
   Kevin Glowacz <kjg@transmissionbt.com> (Web client)
@@ -40,8 +41,8 @@ Mac OS X Translators, current release:
   Guilherme Fernandes (Brazilian Portuguese)
   Sven-S. Porst (German)
   Tianhao He (Simplified Chinese)
-  S�rgio Miranda (European Portuguese)
-  Daniel �stergaard Nielsen (Danish)
+  Sérgio Miranda (European Portuguese)
+  Daniel Østergaard Nielsen (Danish)
   Emir SARI (Turkish)
 
 GTK+ Translators: