Merge pull request #9534 from gabmert/naming-conflicts

Change naming in conflicts to location instead of date

src/main/res/layout/conflict_resolve_dialog.xml

@@ -64,7 +64,7 @@
                 android:id="@+id/new_checkbox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/conflict_new_file" />
+                android:text="@string/conflict_local_file" />
 
             <ImageView
                 android:id="@+id/new_thumbnail"
@@ -98,7 +98,7 @@
                 android:id="@+id/existing_checkbox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/conflict_already_existing_file" />
+                android:text="@string/conflict_server_file" />
 
             <ImageView
                 android:id="@+id/existing_thumbnail"

src/main/res/values/strings.xml

@@ -910,8 +910,8 @@
     <string name="sync_not_enough_space_dialog_title">Not enough space</string>
     <string name="conflict_file_headline">Conflicting file %1$s</string>
     <string name="conflict_message_description">If you select both versions, the local file will have a number appended to its name.</string>
-    <string name="conflict_new_file">New file</string>
-    <string name="conflict_already_existing_file">Already existing file</string>
+    <string name="conflict_local_file">Local file</string>
+    <string name="conflict_server_file">Server file</string>
     <string name="thumbnail_for_new_file_desc">Thumbnail for new file</string>
     <string name="thumbnail_for_existing_file_description">Thumbnail for existing file</string>
     <string name="invalid_url">Invalid URL</string>