Skip to content

Commit c7605d7

Browse files
ppareitppareit
committed
Version 2.14.1
1 parent 8b06ced commit c7605d7

11 files changed

Lines changed: 27 additions & 127 deletions

File tree

‎CHANGES‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
Version 2.14.1 (2017/03/01)
2+
* Improve about dialog
3+
* Improve feedback option
4+
* Updated translation for Serbian, Japanese, Spanish and Russian (thanks to multiple translators)
5+
* Bug fixes
16
Version 2.13.1 (2017/01/22)
27
+ Add helpful message when both paid and demo are installed
38
Version 2.13 (2017/01/07)

‎TRANSLATORS‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,18 @@ Mladen Pejaković <[email protected]>
2121
Changes in translations
2222
=======================
2323

24+
For version 2.14.1
25+
(Nothing needs to be done by the translators for this version)
26+
* running_summary_failed_to_get_ip_address (used to be cant_get_url)
27+
- unknown
28+
- ok
29+
- wifi_state_receiver_label
30+
- pst_connecting
31+
- pst_connected
32+
- pst_failed
33+
- pst_unreachable
34+
- pst_disconnected
35+
2436
For version 2.14
2537
+ app_copyright
2638
+ app_url

‎app/build.gradle‎

Lines changed: 9 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
plugins {
2+
id "me.tatarka.retrolambda" version "3.5.0"
3+
}
14
apply plugin: 'com.android.application'
25

36
android {
@@ -9,8 +12,8 @@ android {
912
applicationId "be.ppareit.swiftp"
1013
minSdkVersion 14
1114
targetSdkVersion 24
12-
versionCode 21301
13-
versionName "2.13.1"
15+
versionCode 21401
16+
versionName "2.14.1"
1417
}
1518
productFlavors {
1619
playstore_paid {
@@ -44,31 +47,12 @@ dependencies {
4447
compile fileTree(dir: 'libs', include: ['*.jar'])
4548
compile 'net.vrallev.android:cat:1.0.2'
4649
provided "org.projectlombok:lombok:1.16.6"
47-
compile 'com.android.support:appcompat-v7:25.1.1'
48-
compile 'com.android.support:support-v4:25.1.1'
49-
compile 'com.android.support:design:25.1.1'
50-
compile group:'com.twofortyfouram', name:'android-plugin-client-sdk-for-locale', version:'[4.0.2, 5.0['
50+
compile 'com.android.support:appcompat-v7:25.2.0'
51+
// compile 'com.android.support:support-v4:25.2.0'
52+
compile 'com.android.support:design:25.2.0'
53+
compile 'com.twofortyfouram:android-plugin-client-sdk-for-locale:4.0.2'
5154
}
5255

53-
buildscript {
54-
repositories {
55-
mavenCentral()
56-
}
57-
58-
dependencies {
59-
classpath 'me.tatarka:gradle-retrolambda:3.2.1'
60-
}
61-
}
62-
63-
repositories {
64-
mavenCentral() // for retrolambda
65-
jcenter() // for locale
66-
maven { url "https://dl.bintray.com/twofortyfouram/maven" }
67-
}
68-
69-
apply plugin: 'com.android.application' //or apply plugin: 'java'
70-
apply plugin: 'me.tatarka.retrolambda'
71-
7256
android {
7357
packagingOptions {
7458
exclude 'META-INF/DEPENDENCIES.txt'

‎app/src/main/res/values-de/strings.xml‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -72,21 +72,6 @@ Die weitere Entwicklung dieses Open Source Programmes kann durch den Kauf im Goo
7272
Alle Entwicklungsaktivitäten können unter https://github.com/ppareit/swiftp verfolgt werden.
7373
Gemeldete Probleme und Verbesserungsvorschläge sind unter https://github.com/ppareit/swiftp/issues einsehbar.\n\n
7474
</string>
75-
<string name="about_dlg_title">FTP Server Info</string>
76-
<string name="about_dlg_message">
77-
<b>Beschreibung: </b>
78-
FTP Server (SwiFTP) ermöglicht es dir einen FTP-Server auf deinem Androidgerät laufen zu lassen.\n\n\
79-
<b>Webseite:</b>
80-
http://ppareit.github.com/swiftp\n\n
81-
<b>Aktueller Betreuer:</b>
82-
Pieter Pareit ([email protected])\n\n
83-
<b>Programmierung: </b>\
84-
Dave Revell ([email protected]), Pieter Pareit ([email protected])\n\n\
85-
<b>Grafik:</b>
86-
Birgit Niemegeers\n\n
87-
<b>Lizenz: </b>
88-
GNU General Public License v3.0\n\n
89-
</string>
9075
<string name="notification_server_starting">Starte auf %s</string>
9176
<string name="notification_title">FTP Server gestartet</string>
9277
<string name="notification_text">auf %s</string>

‎app/src/main/res/values-it/strings.xml‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -76,23 +76,6 @@ Google Play Store. Puoi seguire attivamente lo sviluppo su https://github.com/pp
7676
Se hai qualche idea per nuove funzionalità da implementare, dai uno sguardo all\'issue tracker su
7777
https://github.com/ppareit/swiftp/issues .\n\n
7878
</string>
79-
<string name="about_dlg_title">Info Server FTP</string>
80-
<string name="about_dlg_message">
81-
<b>Descrizione: </b>
82-
Server FTP (SwiFTP) ti permette di eseguire un server FTP sul tuo dispositivo Android.\n\n\
83-
<b>Sito web:</b>
84-
http://ppareit.github.com/swiftp/\n\n
85-
<b>Manutentore attuale:</b>
86-
Pieter Pareit ([email protected])\n\n
87-
<b>Programmazione: </b>\
88-
Dave Revell ([email protected]), Pieter Pareit ([email protected])\n\n\
89-
<b>Artwork:</b>
90-
Birgit Niemegeers\n\n
91-
<b>Traduzione IT: </b>
92-
Valerio Bozzolan\n\n
93-
<b>Licenza: </b>
94-
GNU General Public License v3.0\n\n
95-
</string>
9679
<string name="notification_server_starting">Esecuzione su %s</string>
9780
<string name="notification_title">Server FTP in esecuzione</string>
9881
<string name="notification_text">su %s</string>

‎app/src/main/res/values-ja/strings.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@ https://github.com/ppareit/swiftp/issues を参照してください。\n\n
112112
<string name="username_validation_error">パスワードは1文字以上の英数字で入力してください。他の文字は使用できません。</string>
113113
<string name="password_validation_error">パスワードは1文字以上の英数字で入力してください。他の文字は使用できません。</string>
114114
<string name="port_validation_error">ポート番号は 1 ～ 65535 の範囲で入力してください。</string>
115-
<string name="wifi_state_receiver_label">Wifiステートレシーバ</string>
116115
<string name="storage_warning">警告: ストレージが使用できません。アンマウントする必要があるかもしれません。</string>
117116

118117
<string name="widget_name">FTP サーバ・ウィジェット</string>

‎app/src/main/res/values-nl/strings.xml‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -69,21 +69,6 @@ via de google play store.. Je kan de ontwikkeling volgen via
6969
https://github.com/ppareit/swiftp . Problemen die opgelost worden en nieuwe mogelijkheden
7070
van de volgende versie staan op https://github.com/ppareit/swiftp/issues .\n\n
7171
</string>
72-
<string name="about_dlg_title">Over FTP Server</string>
73-
<string name="about_dlg_message">
74-
<b>Beschrijving: </b>
75-
FTP Server (SwiFTP) laat het toe om een ftp server te draaien op je android toestel.\n\n\
76-
<b>Website:</b>
77-
http://ppareit.github.com/swiftp/\n\n
78-
<b>Huidige ontwikkelaar:</b>
79-
Pieter Pareit ([email protected])\n\n
80-
<b>Programming: </b>\
81-
Dave Revell ([email protected]), Pieter Pareit ([email protected])\n\n\
82-
<b>Artwork:</b>
83-
Birgit Niemegeers\n\n
84-
<b>License: </b>
85-
GNU General Public License v3.0\n\n
86-
</string>
8772
<string name="notification_server_starting">Starten op %s</string>
8873
<string name="notification_title">FTP Server is verbonden</string>
8974
<string name="notification_text">op %s</string>

‎app/src/main/res/values-ru/strings.xml‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -76,21 +76,6 @@ along with SwiFTP. If not, see <http://www.gnu.org/licenses/>.
7676
Если у Вас есть идеи, как улучшить программу, Вы можете оформить заявку в системе отслеживания по адресу
7777
https://github.com/ppareit/swiftp/issues .\n\n
7878
</string>
79-
<string name="about_dlg_title">О программе FTP Server</string>
80-
<string name="about_dlg_message">
81-
<b>Описание: </b>
82-
FTP Server (SwiFTP) - простая и удобная программа, которая позволяет запустить ftp сервер на Вашем android-телефоне или планшетном компьютере.\n\n\
83-
<b>Веб-сайт:</b>
84-
http://ppareit.github.com/swiftp/\n\n
85-
<b>Текущее сопровождение:</b>
86-
Pieter Pareit ([email protected])\n\n
87-
<b>Программирование: </b>\
88-
Dave Revell ([email protected]), Pieter Pareit ([email protected])\n\n\
89-
<b>Оформление:</b>
90-
Birgit Niemegeers\n\n
91-
<b>Лицензии: </b>
92-
GNU General Public License v3.0\n\n
93-
</string>
9479

9580
<!-- Special care for the follwoing string pleace -->
9681
<string name="notification_server_starting">FTP сервер запускается...%s</string>

‎app/src/main/res/values-sr/strings.xml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -112,24 +112,16 @@ https://github.com/ppareit/swiftp/issues .\n\n
112112
<string name="username_validation_error">Корисничко име мора да садржи 1 или више алфанумеричких знакова. Остали знакови нису допуштени.</string>
113113
<string name="password_validation_error">Лозинка мора да садржи 1 или више алфанумеричких знакова. Остали знакови нису допуштени.</string>
114114
<string name="port_validation_error">Број порта мора да буде у распону од 1 до 65535.</string>
115-
<string name="wifi_state_receiver_label">WifiStateReceiver</string>
116115
<string name="storage_warning">Упозорење: складиште није доступно. Можда желите да га демонтирате.</string>
117116

118117
<string name="widget_name">Виџет ФТП сервера</string>
119118
<string name="notif_settings_text">Поставке</string>
120119
<string name="app_copyright">Власничка права 2012 — 2017</string>
121-
<string name="app_url" translatable="false">https://ppareit.github.io/swiftp/</string>
122120
<string name="about_license_title">Лиценца</string>
123121
<string name="about_license_name">ГНУ ГПЛ3</string>
124-
<string name="about_license_url" translatable="false">https://www.gnu.org/licenses/gpl-3.0.en.html</string>
125122
<string name="about_description_title">Опис</string>
126123
<string name="about_description_text">ФТП сервер (SwiFTP) вам дозвољава да покренете фтп сервер на вашем Андроид уређају.</string>
127124
<string name="about_libraries_title">Библиотеке</string>
128125
<string name="about_contributor_title">Доприносиоци</string>
129-
<string name="about_contributor_list" translatable="false">
130-
Dave Revell, Alexander Friesen, tescott425, Peng Fei, MadMaverick9, j3l11234,
131-
Sergey Kondakov, Tianhao Wu, Lorenzo M, Naofumi Fukue, Valerio Bozzolan, Thomas Löwe, Mladen Pejaković,
132-
Birgit Niemegeers
133-
</string>
134126

135127
</resources>

‎app/src/main/res/values-zh-rCN/strings.xml‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -68,21 +68,6 @@ along with SwiFTP. If not, see <http://www.gnu.org/licenses/>.
6868
随时查看并跟进开发进度，如果您有任何建议或想法，您可以访问
6969
https://github.com/ppareit/swiftp/issues 提交您的建议。\n\n
7070
</string>
71-
<string name="about_dlg_title">关于 FTP Server</string>
72-
<string name="about_dlg_message">
73-
<b>简介：</b>
74-
FTP Server (SwiFTP) 允许在您的 Android 设备上运行文件传输服务器。\n\n\
75-
<b>站点：</b>
76-
http://ppareit.github.com/swiftp/\n\n
77-
<b>维护：</b>
78-
Pieter Pareit ([email protected])\n\n
79-
<b>编译：</b>
80-
Dave Revell ([email protected]), Pieter Pareit ([email protected])\n\n\
81-
<b>美工：</b>
82-
Birgit Niemegeers\n\n
83-
<b>许可：</b>
84-
GNU General Public License v3.0\n\n
85-
</string>
8671

8772
<string name="nsd_servername_postfix">FTP Server</string>
8873

0 commit comments

Comments
 (0)