Skip to content
Snippets Groups Projects
Commit 6ec7e30b authored by Jawnnypoo's avatar Jawnnypoo
Browse files

Merge branch 'develop'

parents 6c016a2d c7245825
No related branches found
No related tags found
No related merge requests found
Pipeline #
Hide whitespace changes
Inline Side-by-side
Showing
with 387 additions and 62 deletions
app/src/main/res/layout/activity_merge_request.xml 0 → 100644
+ 82
− 0
View file @ 6ec7e30b
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="?attr/actionBarSize"
android:orientation="vertical">
<android.support.design.widget.AppBarLayout
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary" />
<TextView
android:id="@+id/merge_request_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="16dp"
tools:text="This is an issue"/>
</android.support.design.widget.AppBarLayout>
<com.commit451.gitlab.views.GitLabSwipeRefreshLayout
android:id="@+id/swipe_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<android.support.v7.widget.RecyclerView
android:id="@+id/list"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
</com.commit451.gitlab.views.GitLabSwipeRefreshLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/rel1"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:orientation="horizontal"
android:layout_gravity="bottom"
android:background="?attr/colorPrimary" >
<EditText
android:id="@+id/new_note_edit"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginLeft="8dp"
android:layout_gravity="center_vertical"
android:hint="@string/new_note_hint"
android:inputType="textCapSentences|textAutoCorrect|textMultiLine"
android:imeOptions="actionNone" />
<ImageView
android:id="@+id/new_note_button"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:paddingRight="16dp"
android:paddingLeft="16dp"
android:contentDescription="@null"
android:src="@drawable/ic_send_24dp"
android:background="?attr/selectableItemBackgroundBorderless"/>
</LinearLayout>
<include layout="@layout/progress_fullscreen"/>
</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
app/src/main/res/layout/activity_settings.xml 0 → 100644
+ 59
− 0
View file @ 6ec7e30b
<?xml version="1.0" encoding="utf-8"?>
<merge xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingTop="?attr/actionBarSize">
<FrameLayout
android:id="@+id/trust_all_hosts_root"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:orientation="horizontal"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin">
<TextView
android:id="@+id/notification_sound_label"
style="?android:attr/textAppearanceMedium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/trust_all_hosts" />
<CheckBox
android:id="@+id/notification_sound"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right" />
</FrameLayout>
</LinearLayout>
</ScrollView>
<android.support.design.widget.AppBarLayout
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"/>
</android.support.design.widget.AppBarLayout>
</merge>
\ No newline at end of file
app/src/main/res/layout/activity_user.xml
+ 2
− 1
View file @ 6ec7e30b
@@ -30,7 +30,8 @@
android:scaleType="centerCrop"
android:fitsSystemWindows="true"
app:layout_collapseMode="parallax"
android:contentDescription="@null"/>
android:contentDescription="@null"
android:transitionName="@string/transition_user"/>
 
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
app/src/main/res/layout/fragment_issues.xml
+ 24
− 1
View file @ 6ec7e30b
@@ -4,6 +4,18 @@
android:layout_width="match_parent"
android:layout_height="match_parent" >
 
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<Spinner
android:id="@+id/issue_spinner"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"/>
<com.commit451.gitlab.views.GitLabSwipeRefreshLayout
android:id="@+id/swipe_layout"
android:layout_width="match_parent"
@@ -13,7 +25,6 @@
android:id="@+id/list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="8dp"
android:paddingBottom="88dp"
android:clipToPadding="false"
@@ -21,6 +32,8 @@
 
</com.commit451.gitlab.views.GitLabSwipeRefreshLayout>
 
</LinearLayout>
<android.support.design.widget.FloatingActionButton
android:id="@+id/add_issue_button"
android:layout_width="wrap_content"
@@ -29,4 +42,14 @@
android:layout_margin="@dimen/padding_normal"
android:src="@drawable/ic_add_24dp" />
 
<TextView
android:id="@+id/message_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:text="@string/no_issues"
android:gravity="center"
android:layout_gravity="center"
android:visibility="gone"/>
</FrameLayout>
app/src/main/res/layout/fragment_merge_request.xml
+ 29
− 14
View file @ 6ec7e30b
@@ -2,33 +2,48 @@
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent" >
android:layout_height="match_parent">
 
<com.commit451.gitlab.views.GitLabSwipeRefreshLayout
android:id="@+id/swipe_layout"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:orientation="vertical">
 
<android.support.v7.widget.RecyclerView
android:id="@+id/list"
<Spinner
android:id="@+id/state_spinner"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"/>
 
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:clipToPadding="false"
/>
 
</com.commit451.gitlab.views.GitLabSwipeRefreshLayout>
<com.commit451.gitlab.views.GitLabSwipeRefreshLayout
android:id="@+id/swipe_layout"
android:layout_width="match_parent"
android:layout_height="match_parent">
<android.support.v7.widget.RecyclerView
android:id="@+id/list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
android:paddingBottom="8dp"
android:paddingTop="8dp"
/>
</com.commit451.gitlab.views.GitLabSwipeRefreshLayout>
</LinearLayout>
 
<TextView
android:id="@+id/error_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_margin="10dp"
android:text="@string/no_files_found"
android:gravity="center"
android:layout_gravity="center"
android:text="@string/no_files_found"
android:visibility="gone"/>
 
</FrameLayout>
app/src/main/res/layout/header_merge_request.xml 0 → 100644
+ 44
− 0
View file @ 6ec7e30b
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/description"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginTop="16dp"
tools:text="Description"
android:textAppearance="?android:attr/textAppearanceMedium" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_margin="16dp">
<de.hdodenhof.circleimageview.CircleImageView
android:id="@+id/author_image"
android:layout_width="@dimen/image_size"
android:layout_height="@dimen/image_size"
android:contentDescription="@null"/>
<TextView
android:id="@+id/author"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/padding_normal"
android:layout_marginRight="@dimen/padding_normal"
android:layout_gravity="center_vertical"
tools:text="Jawnnypoo created issue 8 hours ago"
android:textAppearance="?android:attr/textAppearanceMedium" />
</LinearLayout>
</LinearLayout>
\ No newline at end of file
app/src/main/res/layout/nav_drawer.xml → app/src/main/res/layout/header_nav_drawer.xml
+ 16
− 10
View file @ 6ec7e30b
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -18,9 +20,10 @@
android:scaleType="fitXY"
android:src="@drawable/header" />
 
<RelativeLayout
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:fitsSystemWindows="true">
 
<de.hdodenhof.circleimageview.CircleImageView
android:id="@+id/profile_image"
@@ -28,7 +31,8 @@
android:layout_height="@dimen/larger_image_size"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginTop="16dp" />
android:layout_marginTop="16dp"
android:fitsSystemWindows="true"/>
 
<FrameLayout
android:layout_width="match_parent"
@@ -36,7 +40,7 @@
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginBottom="16dp"
android:layout_alignParentBottom="true"
android:layout_gravity="bottom"
>
 
<LinearLayout
@@ -45,22 +49,25 @@
android:orientation="vertical">
 
 
<TextView
<com.devspark.robototextview.widget.RobotoTextView
android:id="@+id/profile_user"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="?android:attr/textColorPrimaryInverse"
android:singleLine="true"
android:ellipsize="end"
android:textColor="@color/black"
android:textSize="14sp"
app:typeface="roboto_medium"
tools:text="Jawnnypew" />
 
<TextView
android:id="@+id/profile_email"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="?android:attr/textColorSecondaryInverse"
android:singleLine="true"
android:ellipsize="end"
android:textColor="@color/black"
android:textSize="14sp"
tools:text="poop123@aol.com" />
</LinearLayout>
 
@@ -73,7 +80,7 @@
android:tint="@color/window_background_color"/>
 
</FrameLayout>
</RelativeLayout>
</FrameLayout>
 
</FrameLayout>
 
@@ -81,7 +88,6 @@
android:id="@+id/list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:clipToPadding="false"
app/src/main/res/layout/item_group.xml
+ 1
− 0
View file @ 6ec7e30b
@@ -18,6 +18,7 @@
android:layout_gravity="center_vertical"
android:contentDescription="@null"
tools:src="@drawable/ic_folder_24dp"
android:transitionName="@string/transition_group"
/>
 
<LinearLayout
app/src/main/res/layout/item_issue.xml
+ 1
− 12
View file @ 6ec7e30b
@@ -47,18 +47,7 @@
android:layout_below="@+id/issue_message"
android:textSize="@dimen/text_size_tiny"
android:textColor="?android:attr/textColorSecondary"
tools:text="Jawnnypoo"/>
<TextView
android:id="@+id/issue_state"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/issue_message"
android:layout_alignParentRight="true"
android:textSize="@dimen/text_size_tiny"
android:textColor="?android:attr/textColorSecondary"
tools:text="Closed"/>
tools:text="Created 45 days ago by Jawnnypoo"/>
 
</RelativeLayout>
 
app/src/main/res/layout/item_member.xml
+ 1
− 0
View file @ 6ec7e30b
@@ -17,6 +17,7 @@
android:layout_marginRight="8dp"
android:layout_gravity="center_vertical"
android:contentDescription="@null"
android:transitionName="@string/transition_user"
tools:src="@drawable/ic_doc"
/>
 
app/src/main/res/layout/item_merge_request.xml
+ 0
− 11
View file @ 6ec7e30b
@@ -49,17 +49,6 @@
android:textColor="?android:attr/textColorSecondary"
tools:text="Jawnnypoo"/>
 
<TextView
android:id="@+id/request_state"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/request_title"
android:layout_alignParentRight="true"
android:textSize="@dimen/text_size_tiny"
android:textColor="?android:attr/textColorSecondary"
tools:text="Max 25, 2019"/>
</RelativeLayout>
 
</RelativeLayout>
\ No newline at end of file
app/src/main/res/layout/user_list_item.xml → app/src/main/res/layout/item_merge_request_comment.xml
+ 49
− 0
View file @ 6ec7e30b
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/note_list_item"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:gravity="start"
android:minHeight="?android:attr/listPreferredItemHeight"
android:orientation="horizontal"
android:paddingLeft="8dp"
android:paddingRight="?android:attr/scrollbarSize" >
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:orientation="horizontal">
 
<RelativeLayout
android:id="@+id/img_lay"
<de.hdodenhof.circleimageview.CircleImageView
android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="8dp" >
android:src="@mipmap/ic_launcher"
android:layout_marginLeft="@dimen/padding_normal"
android:layout_gravity="center_vertical"
android:contentDescription="@null"/>
 
<ImageView
android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/ic_launcher" />
</RelativeLayout>
<RelativeLayout
android:layout_toRightOf="@+id/img_lay"
android:id="@+id/user_list_item"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:minHeight="?android:attr/listPreferredItemHeight"
android:paddingRight="?android:attr/scrollbarSize" >
android:layout_marginLeft="@dimen/padding_normal"
android:layout_marginRight="@dimen/padding_normal"
android:orientation="vertical" >
<TextView
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="marquee"
android:fadingEdge="horizontal"
android:singleLine="true"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:textAppearance="?android:attr/textAppearanceMedium" />
tools:text="Username"
android:textStyle="italic"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorTertiary" />
 
<TextView
android:id="@+id/summary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignLeft="@+id/title"
android:layout_below="@+id/title"
android:ellipsize="marquee"
android:fadingEdge="horizontal"
android:singleLine="true"
tools:text="Comment"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorSecondary" />
<TextView
android:id="@+id/custom"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignParentTop="true"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorSecondary" />
</RelativeLayout>
android:textColor="?android:attr/textColorPrimary" />
</LinearLayout>
 
</RelativeLayout>
\ No newline at end of file
</LinearLayout>
\ No newline at end of file
app/src/main/res/layout/item_user.xml
+ 1
− 0
View file @ 6ec7e30b
@@ -17,6 +17,7 @@
android:layout_marginRight="8dp"
android:layout_gravity="center_vertical"
android:contentDescription="@null"
android:transitionName="@string/transition_user"
tools:src="@drawable/ic_folder_24dp"
/>
 
app/src/main/res/values/do_not_translate.xml deleted 100644 → 0
+ 0
− 10
View file @ 6c016a2d
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string-array name="role_values" translatable="false">
<item>10</item>
<item>20</item>
<item>30</item>
<item>40</item>
<item>50</item>
</string-array>
</resources>
app/src/main/res/values/ids.xml
+ 1
− 0
View file @ 6ec7e30b
<?xml version="1.0" encoding="utf-8"?>
<resources>
<item name="list_position" type="id"/>
<item name="list_view_holder" type="id"/>
</resources>
\ No newline at end of file
app/src/main/res/values/strings.xml
+ 42
− 1
View file @ 6ec7e30b
@@ -62,6 +62,7 @@
<string name="normal_link"><u>Login using username or email</u></string>
<string name="certificate_title">Certificate not trusted</string>
<string name="certificate_message">The certificate the server used was not issued by a trusted authority.\n\nThis could mean a hacker is trying to intercept your communications.\n\nTo use a self-signed certificate, please follow this <a href="https://support.google.com/nexus/answer/2844832?hl=en">guide</a>.</string>
<string name="not_a_valid_url">Not a valid URL</string>
 
<!-- Error messages -->
<string name="connection_error">Connection failed</string>
@@ -70,7 +71,8 @@
<string name="connection_error_files">Failed to load files</string>
<string name="connection_error_users">Failed to load users</string>
 
<string name="login_error">Login failed Please double-check your login information.</string>
<string name="login_unauthorized">Incorrect credentials. Try again</string>
<string name="login_error">Login failed. Please check your login information</string>
<string name="login_input_error">Please enter a valid url.</string>
 
<string name="file_load_error">Failed to load file</string>
@@ -103,6 +105,7 @@
<string name="filter_projects">Filter projects</string>
<string name="logout_title">Are you sure you want to log out?</string>
<string name="failed_to_load">Failed to load</string>
<string name="just_now">Just now</string>
 
<!-- Overview -->
<string name="no_readme_found">No README found for project</string>
@@ -129,6 +132,18 @@
<string name="close">Close</string>
<string name="created_issue">created issue</string>
<string name="error_changing_issue">There was an error changing the issue</string>
<string name="no_issues">No issues. Good job?</string>
<string name="issue_opened">Opened</string>
<string name="issue_closed">Closed</string>
<string-array name="issue_state_names">
<item>@string/issue_opened</item>
<item>@string/issue_closed</item>
</string-array>
<string-array name="issue_state_values">
<item>opened</item>
<item>closed</item>
</string-array>
<string name="created_time">Created %1$s by %2$s</string>
 
<!-- User -->
<string name="remove_user_dialog_title">Remove user?</string>
@@ -148,6 +163,14 @@
<item>Owner</item>
</string-array>
 
<string-array name="role_values" translatable="false">
<item>10</item>
<item>20</item>
<item>30</item>
<item>40</item>
<item>50</item>
</string-array>
<!-- About -->
<string name="about">About</string>
<string name="contributors">Contributors</string>
@@ -160,7 +183,25 @@
 
<!-- Merge Requests -->
<string name="no_merge_requests">No merge requests</string>
<string name="merge_request_number">Merge Request #</string>
<string name="merge_request_state_value_default">opened</string>
<string-array name="merge_request_state_names">
<item>Open</item>
<item>Merged</item>
<item>Closed</item>
<item>All</item>
</string-array>
<string-array name="merge_request_state_values">
<item>@string/merge_request_state_value_default</item>
<item>merged</item>
<item>closed</item>
<item>all</item>
</string-array>
 
<!-- Groups -->
<string name="no_groups">No groups.</string>
<!-- Settings -->
<string name="trust_all_hosts">Trust all hosts</string>
</resources>
\ No newline at end of file
app/src/main/res/values/styles.xml
+ 28
− 2
View file @ 6ec7e30b
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools">
<!-- Base application theme. -->
<style name="AppTheme" parent="Theme.AppCompat.NoActionBar">
<!-- Customize your theme here. -->
<item name="colorPrimary">@color/purple</item>
<item name="colorPrimaryDark">@color/purple_dark</item>
<item name="android:navigationBarColor" tools:ignore="NewApi">?attr/colorPrimaryDark</item>
<item name="colorAccent">@color/yellow</item>
<item name="android:windowContentTransitions" tools:ignore="NewApi">true</item>
<item name="dialogTheme">@style/AppDialogTheme</item>
</style>
 
<style name="Activity" parent="AppTheme"/>
<style name="Activity.Projects">
<item name="android:colorPrimaryDark">?attr/colorPrimary</item>
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:windowTranslucentStatus" tools:ignore="NewApi">true</item>
</style>
<style name="Activity.Groups">
<item name="android:colorPrimaryDark">?attr/colorPrimary</item>
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:windowTranslucentStatus" tools:ignore="NewApi">true</item>
</style>
<style name="Activity.User">
<item name="android:colorPrimaryDark">@android:color/transparent</item>
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:windowTranslucentStatus" tools:ignore="NewApi">true</item>
</style>
<style name="Activity.Group">
<item name="android:colorPrimaryDark">@android:color/transparent</item>
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:windowTranslucentStatus" tools:ignore="NewApi">true</item>
</style>
<style name="AppDialogTheme" parent="Theme.AppCompat.Dialog">
<item name="colorAccent">@color/yellow</item>
<item name="windowNoTitle">true</item>
app/src/main/res/values/transitions.xml 0 → 100644
+ 7
− 0
View file @ 6ec7e30b
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- Transitioning from a group list item to a group detail -->
<string name="transition_group">group</string>
<!-- Transition from user in a list to user detail-->
<string name="transition_user">user</string>
</resources>
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment