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-mk | |
| 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-mk')
| -rw-r--r-- | app/src/main/res/values-mk/strings.xml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml index 33c18c8..320d693 100644 --- a/app/src/main/res/values-mk/strings.xml +++ b/app/src/main/res/values-mk/strings.xml @@ -64,5 +64,4 @@ <string name="pref_fullscreen_title">На цел екран</string> <string name="pref_fullscreen_summary">Сокриј ја статусната трака додека си во конзола</string> <string name="pref_memkeys_title">Запомни ги клучевите во меморија</string> - <string name="pref_update_title">Проверка на ажурирања</string> </resources> |