update Makefile

Author: Saket Hatwar

Makefile

@@ -159,14 +159,6 @@ publication:
 
 server_processes_manager:
 	target=server_processes_manager npm run compile
-
-<<<<<<< HEAD
-<<<<<<< HEAD
-conflict_resolver:
-	target=conflict_resolver npm run compile
-=======
->>>>>>> c5e729db3 (Translate strings from data table / filters so that candidate list module is fully translated)
-=======
+	
 conflict_resolver:
 	target=conflict_resolver npm run compile
->>>>>>> d56f08bf9 (Add withTranslation for conflict_resolver)

locale/ja/LC_MESSAGES/loris.po

@@ -175,3 +175,13 @@ msgstr "ページあたりの最大行数:"
 
 msgid "Download Table as CSV"
 msgstr "表をCSVとしてダウンロード"
+
+msgid "NEW"
+msgstr "新しい"
+
+msgid "Updated"
+msgstr "更新"
+
+msgid "Uploaded"
+msgstr "アップロード済み"
+