Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename kill_service to stop_session #695

Merged
merged 1 commit into from
Mar 14, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/main/java/tech/ula/ui/SessionListFragment.kt
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ class SessionListFragment : Fragment() {

private fun doSessionContextItemSelected(session: Session, item: MenuItem): Boolean {
return when (item.itemId) {
R.id.menu_item_session_kill_service -> stopService(session)
R.id.menu_item_session_stop_session -> stopService(session)
R.id.menu_item_session_edit -> editSession(session)
R.id.menu_item_session_delete -> deleteSession(session)
else -> super.onContextItemSelected(item)
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/menu/context_menu_active_sessions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
xmlns:android="http://schemas.android.com/apk/res/android" >

<item
android:id="@+id/menu_item_session_kill_service"
android:title="@string/kill_service" />
android:id="@+id/menu_item_session_stop_session"
android:title="@string/stop_session" />

</menu>
2 changes: 1 addition & 1 deletion app/src/main/res/values-ar/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<!-- Menus -->
<string name="app_info">معلومات التطبيق</string>
<string name="stop_app">ايقاف التطبيق</string>
<string name="kill_service">قتل الخدمة</string> <!-- We know this says name="kill_service" but it is really stopping a session. -->
<string name="stop_session">قتل الخدمة</string>
<string name="edit">تعديل</string>
<string name="delete">حذف</string>
<string name="save">حفظ</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-es/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<!-- Menus -->
<string name="app_info">Información de Aplicación</string>
<string name="stop_app">Parar Aplicación</string>
<string name="kill_service">Parar Sesión</string>
<string name="stop_session">Parar Sesión</string>
<string name="edit">Editar</string>
<string name="delete">Borrar</string>
<string name="save">Guardar</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-fa/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<!-- Menus -->
<string name="app_info">اطلاعات کاره</string>
<string name="stop_app">توقف کاره</string>
<string name="kill_service">توقف خدمت</string>
<string name="stop_session">توقف خدمت</string>
<string name="edit">ویرایش</string>
<string name="delete">پاک‌کردن</string>
<string name="save">ذخیره‌کردن</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-fr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<!-- Menus -->
<string name="app_info">Info appli</string>
<string name="stop_app">Arrêter l\'appli</string>
<string name="kill_service">Tuer le service</string>
<string name="stop_session">Tuer le service</string>
<string name="edit">Modifier</string>
<string name="delete">Supprimer</string>
<string name="save">Enregistrer</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-jp/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<!-- Menus -->
<string name="app_info">アプリの情報</string>
<string name="stop_app">アプリを停止</string>
<string name="kill_service">サービスを終了</string>
<string name="stop_session">サービスを終了</string>
<string name="edit">編集</string>
<string name="delete">削除</string>
<string name="save">保存</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-ru/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<!-- Menus -->
<string name="app_info">Информация о приложении</string>
<string name="stop_app">Остановить приложение</string>
<string name="kill_service">Прервать службу</string>
<string name="stop_session">Прервать службу</string>
<string name="edit">Изменить</string>
<string name="delete">Удалить</string>
<string name="save">Сохранить</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-zh-rCN/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<string name="button_continue">继续</string>
<string name="app_info">应用信息</string>
<string name="stop_app">停止应用程序</string>
<string name="kill_service">停止服务</string>
<string name="stop_session">停止服务</string>
<string name="edit">编辑</string>
<string name="delete">删除</string>
<string name="save">储存</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-zh-rTW/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
    <string name="button_continue">繼續</string>
    <string name="app_info">應用信息</string>
    <string name="stop_app">停止應用程序</string>
    <string name="kill_service">停止服務</string>
    <string name="stop_session">停止服務</string>
    <string name="edit">編輯</string>
    <string name="delete">刪除</string>
    <string name="save">儲存</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<!-- Menus -->
<string name="app_info">App Info</string>
<string name="stop_app">Stop App</string>
<string name="kill_service">Kill Service</string> <!-- We know this says name="kill_service" but it is really stopping a session. -->
<string name="stop_session">Stop Session</string>
<string name="edit">Edit</string>
<string name="delete">Delete</string>
<string name="save">Save</string>
Expand Down