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/arrays.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/arrays.xml')
| -rw-r--r-- | app/src/main/res/values/arrays.xml | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index c9090ea..4721490 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -71,16 +71,16 @@ <item>gray</item> </string-array> - <string-array name="list_update" translatable="false"> - <item>@string/list_update_daily</item> - <item>@string/list_update_weekly</item> - <item>@string/list_update_never</item> + <string-array name="list_stickymodifiers" translatable="false"> + <item>@string/no</item> + <item>@string/only_alt</item> + <item>@string/yes</item> </string-array> - <string-array name="list_update_values" translatable="false"> - <item>Daily</item> - <item>Weekly</item> - <item>Never</item> + <string-array name="list_stickymodifiers_values" translatable="false"> + <item>no</item> + <item>alt</item> + <item>yes</item> </string-array> <string-array name="list_keymode" translatable="false"> |