Merge branch 'dvor/enabling-translations'

.gitattributes

@@ -0,0 +1 @@
+*.strings diff=localizablestrings

Antidote.xcodeproj/project.pbxproj

@@ -536,6 +536,16 @@
 		11E6406C1C2D6C3500D24C6D /* ViewPassingGestures.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ViewPassingGestures.swift; sourceTree = "<group>"; };
 		11E640751C2DBAE200D24C6D /* AddFriendController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AddFriendController.swift; sourceTree = "<group>"; };
 		11E640771C2DC15400D24C6D /* HelperFunctions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HelperFunctions.swift; sourceTree = "<group>"; };
+		11F83B751CADC9260074FE11 /* zh */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = zh; path = "zh.lproj/import-profile.html"; sourceTree = "<group>"; };
+		11F83B7C1CADC9270074FE11 /* zh */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh; path = zh.lproj/Localizable.strings; sourceTree = "<group>"; };
+		11F83B7D1CADC9330074FE11 /* da */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = da; path = "da.lproj/import-profile.html"; sourceTree = "<group>"; };
+		11F83B7E1CADC9330074FE11 /* da */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = da; path = da.lproj/Localizable.strings; sourceTree = "<group>"; };
+		11F83B821CADC9460074FE11 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = de; path = "de.lproj/import-profile.html"; sourceTree = "<group>"; };
+		11F83B831CADC9460074FE11 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = "<group>"; };
+		11F83B841CADC9790074FE11 /* pt */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = pt; path = "pt.lproj/import-profile.html"; sourceTree = "<group>"; };
+		11F83B851CADC9790074FE11 /* pt */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pt; path = pt.lproj/Localizable.strings; sourceTree = "<group>"; };
+		11F83B861CADC9820074FE11 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = es; path = "es.lproj/import-profile.html"; sourceTree = "<group>"; };
+		11F83B871CADC9820074FE11 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Localizable.strings; sourceTree = "<group>"; };
 		11FA0ED21BC5842800F3DA5B /* Antidote-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Antidote-Bridging-Header.h"; sourceTree = "<group>"; };
 		11FA0ED31BC5842800F3DA5B /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		11FA0ED91BC584D900F3DA5B /* AppCoordinator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppCoordinator.swift; sourceTree = "<group>"; };
@@ -1042,6 +1052,11 @@
 			knownRegions = (
 				en,
 				ru,
+				zh,
+				da,
+				de,
+				pt,
+				es,
 			);
 			mainGroup = 1164762619794D3300DB20B8;
 			productRefGroup = 1164763019794D3300DB20B8 /* Products */;
@@ -1565,6 +1580,11 @@
 			children = (
 				1131D6C61CA9D8BC00B4531C /* en */,
 				1131D6C91CA9DA1500B4531C /* ru */,
+				11F83B751CADC9260074FE11 /* zh */,
+				11F83B7D1CADC9330074FE11 /* da */,
+				11F83B821CADC9460074FE11 /* de */,
+				11F83B841CADC9790074FE11 /* pt */,
+				11F83B861CADC9820074FE11 /* es */,
 			);
 			name = "import-profile.html";
 			sourceTree = "<group>";
@@ -1582,6 +1602,11 @@
 			children = (
 				9C7475BF1BC698110098B1A4 /* en */,
 				1131D6C41CA9D64500B4531C /* ru */,
+				11F83B7C1CADC9270074FE11 /* zh */,
+				11F83B7E1CADC9330074FE11 /* da */,
+				11F83B831CADC9460074FE11 /* de */,
+				11F83B851CADC9790074FE11 /* pt */,
+				11F83B871CADC9820074FE11 /* es */,
 			);
 			name = Localizable.strings;
 			sourceTree = "<group>";

Antidote/da.lproj/import-profile.html

@@ -1,9 +1,9 @@
 <font size="5;" color="TITLE_COLOR" face="HelveticaNeue">
-<h2>To import your Tox profile:</h2>
+<h2>For at importere din Tox-profil:</h2>
 <font size="5;" color="TEXT_COLOR" face="HelveticaNeue">
 <ol>
-<li>Send the ".tox" file to your device using any app (Mail, Dropbox, etc.).</li>
-    <li>Use "Open In" menu for this file.</li>
-    <li>Select Antidote in a list of available apps.</li>
-    <li>Check the name of your new profile and press OK.</li>
+<li>Send ".tox"-filen til din enhed ved brug af enhver app (Mail, Dropbox, etc.).</li>
+    <li>Brug "Åben i"-menuen til denne fil.</li>
+    <li>Vælg Antidote på en liste over tilgængelige apps.</li>
+    <li>Tjek navnet på din nye profil og tryk på OK.</li>
 </ol></font></font>

CHANGELOG.md

@@ -2,6 +2,10 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [Unreleased][unreleased]
+### Added
+- Chinese, Danish, German, Portuguese, Spanish localizations.
+
 ## [0.10.1] - 2016-03-29
 ### Added
 - Added profile import support [#170](https://github.com/Antidote-for-Tox/Antidote/issues/170).