mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-09-01 21:57:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/cryptofs

Browse Source 
# Conflicts:
#	main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/Scrypt.java
#	main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/jackrabbitservlet/DavFileWithRange.java
#	main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/jackrabbitservlet/FilesystemResourceFactory.java
#	main/frontend-webdav/src/test/java/org/cryptomator/frontend/webdav/WebDavServerTest.java
This commit is contained in:
Sebastian Stenzel
2017-02-24 16:51:42 +01:00
parent 277999112e a7fdf3d325
commit 28cb2e1301
22 changed files with 324 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main/ui/src/test/java/org/cryptomator/ui/settings/LocalizationTest.java
+2 -2
View File
@@ -31,8 +31,8 @@ public class LocalizationTest {
private static final Logger LOG = LoggerFactory.getLogger(LocalizationTest.class);
private static final String RESOURCE_FOLDER_PATH = "/localization/";
private static final String REF_FILE_NAME = "en.txt";
private static final String[] LANG_FILE_NAMES = {"de.txt", "es.txt", "fr.txt", "hu.txt", "it.txt", "kr.txt", "lv.txt", "nl.txt", "pl.txt", "pt.txt", "ru.txt", "sk.txt", "tr.txt", "uk.txt", "zh_HK.txt", "zh_TW.txt",
"zh.txt"};
private static final String[] LANG_FILE_NAMES = {"de.txt", "es.txt", "fr.txt", "hu.txt", "it.txt", "ja.txt", "kr.txt", "lv.txt", "nl.txt", "pl.txt", "pt.txt", "ru.txt", "sk.txt", "tr.txt", "uk.txt", "zh_HK.txt",
"zh_TW.txt", "zh.txt"};
/*
* @see Formatter