diff options
| author | Kenny Root <kenny@the-b.org> | 2015-03-23 16:22:32 +0000 |
|---|---|---|
| committer | Kenny Root <kenny@the-b.org> | 2015-03-23 16:25:06 +0000 |
| commit | f0ca96308b23643df1208acfe72015b46ae70067 (patch) | |
| tree | 265bc747a3b5383075ecb12d99c3c89dcd5a2274 /app/src/main/res/values-hr/strings.xml | |
| parent | 89ee9588459755193dfff3df45f4494d53b25854 (diff) | |
| parent | f129a9b52110ffafec4400e17d78881c50307d8a (diff) | |
| download | connectbot-f0ca96308b23643df1208acfe72015b46ae70067.tar.gz connectbot-f0ca96308b23643df1208acfe72015b46ae70067.tar.bz2 connectbot-f0ca96308b23643df1208acfe72015b46ae70067.zip | |
Merge remote-tracking branch 'origin/master'
Conflicts:
app/src/main/java/org/connectbot/HostListActivity.java
app/src/main/java/org/connectbot/service/TerminalKeyListener.java
Diffstat (limited to 'app/src/main/res/values-hr/strings.xml')
| -rw-r--r-- | app/src/main/res/values-hr/strings.xml | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index d8d8988..a77179b 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -79,8 +79,6 @@ <string name="pref_fullscreen_summary">Sakrij statusnu liniju u konzoli</string> <string name="pref_memkeys_title">Zapamti ključeve u memoriji</string> <string name="pref_memkeys_summary">Čuvaj otključane ključeve u memoriji dok se ne zatvori pozadinski servis</string> - <string name="pref_update_title">Provjera nadogradnji</string> - <string name="pref_update_summary">Odredi učestalost za provjeru ConnectBot nadogradnji</string> <string name="pref_conn_persist_title">Održavaj konekcije</string> <string name="pref_conn_persist_summary">Prisili konekcije da ostanu spojene u pozadini</string> <string name="pref_keymode_title">Prečaci direktorija</string> |