[multi-part] Enable bidrectional sorting
am: 11d23483bf

Change-Id: I6df9c0963cd94586d2f467cf3893e0646eaec98d
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index feace71..7d9e85a 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -16,95 +16,147 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="2783841764617238354">"Dokumenti"</string>
-    <string name="files_label" msgid="6051402950202690279">"Datoteke"</string>
-    <string name="downloads_label" msgid="959113951084633612">"Preuzimanja"</string>
-    <string name="title_open" msgid="4353228937663917801">"Otvori sa"</string>
-    <string name="title_save" msgid="2433679664882857999">"Sačuvaj u"</string>
-    <string name="menu_create_dir" msgid="2547620241173881754">"Novi direktorijum"</string>
-    <string name="menu_grid" msgid="6878021334497835259">"Prikaz mreže"</string>
-    <string name="menu_list" msgid="7279285939892417279">"Prikaz liste"</string>
-    <string name="menu_sort" msgid="7677740407158414452">"Sortiraj prema"</string>
-    <string name="menu_search" msgid="3816712084502856974">"Pretraži"</string>
-    <string name="menu_settings" msgid="6008033148948428823">"Podešavanja"</string>
-    <string name="menu_open" msgid="432922957274920903">"Otvori"</string>
-    <string name="menu_save" msgid="2394743337684426338">"Sačuvaj"</string>
-    <string name="menu_share" msgid="3075149983979628146">"Deli"</string>
-    <string name="menu_delete" msgid="8138799623850614177">"Izbriši"</string>
-    <string name="menu_select_all" msgid="8323579667348729928">"Izaberi sve"</string>
-    <string name="menu_copy" msgid="3612326052677229148">"Kopiraj na..."</string>
-    <string name="menu_move" msgid="1828090633118079817">"Premesti u..."</string>
-    <string name="menu_new_window" msgid="1226032889278727538">"Novi prozor"</string>
-    <string name="menu_copy_to_clipboard" msgid="489311381979634291">"Kopiraj"</string>
-    <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Nalepi"</string>
-    <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Prikaži internu memoriju"</string>
-    <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Prikaži SD karticu"</string>
-    <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"Sakrij internu memoriju"</string>
-    <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Sakrij SD karticu"</string>
-    <string name="menu_file_size_show" msgid="3240323619260823076">"Prikaži veličinu datoteke"</string>
-    <string name="menu_file_size_hide" msgid="8881975928502581042">"Sakrij veličinu datoteke"</string>
-    <string name="button_select" msgid="527196987259139214">"Izaberi"</string>
-    <string name="button_copy" msgid="8706475544635021302">"Kopiraj"</string>
-    <string name="button_move" msgid="2202666023104202232">"Premesti"</string>
-    <string name="button_dismiss" msgid="3714065566893946085">"Odbaci"</string>
-    <string name="button_retry" msgid="4392027584153752797">"Pokušaj ponovo"</string>
-    <string name="sort_name" msgid="9183560467917256779">"Prema imenu"</string>
-    <string name="sort_date" msgid="586080032956151448">"Prema datumu izmene"</string>
-    <string name="sort_size" msgid="3350681319735474741">"Prema veličini"</string>
-    <string name="drawer_open" msgid="4545466532430226949">"Prikaži osnovne elemente"</string>
-    <string name="drawer_close" msgid="7602734368552123318">"Sakrij osnovne elemente"</string>
-    <string name="save_error" msgid="6167009778003223664">"Čuvanje dokumenta nije uspelo"</string>
-    <string name="create_error" msgid="3735649141335444215">"Direktorijum nije napravljen"</string>
-    <string name="query_error" msgid="1222448261663503501">"Slanje upita za dokumente nije uspelo"</string>
-    <string name="root_recent" msgid="4470053704320518133">"Nedavno"</string>
-    <string name="root_available_bytes" msgid="8568452858617033281">"Slobodno je <xliff:g id="SIZE">%1$s</xliff:g>"</string>
-    <string name="root_type_service" msgid="2178854894416775409">"Usluge skladištenja"</string>
-    <string name="root_type_shortcut" msgid="3318760609471618093">"Prečice"</string>
-    <string name="root_type_device" msgid="7121342474653483538">"Uređaji"</string>
-    <string name="root_type_apps" msgid="8838065367985945189">"Još aplikacija"</string>
-    <string name="empty" msgid="7858882803708117596">"Nema stavki"</string>
-    <string name="toast_no_application" msgid="1339885974067891667">"Nije moguće otvoriti datoteku"</string>
-    <string name="toast_failed_delete" msgid="2180678019407244069">"Nije moguće izbrisati neke dokumente"</string>
-    <string name="share_via" msgid="8966594246261344259">"Delite preko"</string>
-    <string name="copy_notification_title" msgid="6374299806748219777">"Kopiranje datoteka"</string>
-    <string name="move_notification_title" msgid="6193835179777284805">"Datoteke se premeštaju"</string>
-    <string name="copy_remaining" msgid="6283790937387975095">"Još <xliff:g id="DURATION">%s</xliff:g>"</string>
-    <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
-      <item quantity="one">Kopiranje <xliff:g id="COUNT_1">%1$d</xliff:g> datoteke.</item>
-      <item quantity="few">Kopiranje <xliff:g id="COUNT_1">%1$d</xliff:g> datoteke.</item>
-      <item quantity="other">Kopiranje <xliff:g id="COUNT_1">%1$d</xliff:g> datoteka.</item>
+    <string name="app_label" msgid="3303317181319900082">"Datoteke"</string>
+    <string name="downloads_label" msgid="5462789470049501103">"Preuzimanja"</string>
+    <string name="title_open" msgid="3165686459158020921">"Otvori iz"</string>
+    <string name="title_save" msgid="4384490653102710025">"Sačuvaj u"</string>
+    <string name="menu_create_dir" msgid="2413624798689091042">"Novi direktorijum"</string>
+    <string name="menu_grid" msgid="1453636521731880680">"Prikaz mreže"</string>
+    <string name="menu_list" msgid="6714267452146410402">"Prikaz liste"</string>
+    <string name="menu_sort" msgid="6754410552665101834">"Sortiraj prema"</string>
+    <string name="menu_search" msgid="1876699106790719849">"Pretraži"</string>
+    <string name="menu_settings" msgid="6520844520117939047">"Podešavanja memorije"</string>
+    <string name="menu_open" msgid="9092138100049759315">"Otvori"</string>
+    <string name="menu_save" msgid="5195367497138965168">"Sačuvaj"</string>
+    <string name="menu_share" msgid="4307140947108068356">"Deli"</string>
+    <string name="menu_delete" msgid="1022254131543256626">"Izbriši"</string>
+    <string name="menu_select_all" msgid="7600576812185570403">"Izaberi sve"</string>
+    <string name="menu_copy" msgid="7404820171352314754">"Kopiraj u…"</string>
+    <string name="menu_move" msgid="2310760789561129882">"Premesti u…"</string>
+    <string name="menu_new_window" msgid="2947837751796109126">"Novi prozor"</string>
+    <string name="menu_cut_to_clipboard" msgid="2878752142015026229">"Iseci"</string>
+    <string name="menu_copy_to_clipboard" msgid="5064081159073330776">"Kopiraj"</string>
+    <string name="menu_paste_from_clipboard" msgid="360947260414135827">"Nalepi"</string>
+    <string name="menu_advanced_show" msgid="7558626506462906726">"Prikaži internu memoriju"</string>
+    <string name="menu_advanced_hide" msgid="6488381508009246334">"Sakrij internu memoriju"</string>
+    <string name="menu_file_size_show" msgid="8035723306878852180">"Prikaži velič. datoteke"</string>
+    <string name="menu_file_size_hide" msgid="8953697126109694855">"Sakrij veličinu datoteke"</string>
+    <string name="button_select" msgid="240863497069321364">"Izaberi"</string>
+    <string name="button_copy" msgid="8219059853840996027">"Kopiraj"</string>
+    <string name="button_move" msgid="8596460499325291272">"Premesti"</string>
+    <string name="button_dismiss" msgid="7235249361023803349">"Odbaci"</string>
+    <string name="button_retry" msgid="4011461781916631389">"Pokušaj ponovo"</string>
+    <string name="sort_name" msgid="6790411054171883704">"Prema nazivu"</string>
+    <string name="sort_date" msgid="3237147045109806231">"Prema datumu izmene"</string>
+    <string name="sort_size" msgid="5532930542340076266">"Prema veličini"</string>
+    <string name="column_name" msgid="4078850838520640399">"Naziv"</string>
+    <string name="column_summary" msgid="1540962781310003494">"Rezime"</string>
+    <string name="column_date" msgid="5244069131770543137">"Izmenjeno"</string>
+    <string name="column_size" msgid="3426180342785653748">"Veličina"</string>
+    <string name="sort_direction_ascending" msgid="5882787683763248102">"Rastuće"</string>
+    <string name="sort_direction_descending" msgid="1729187589765894076">"Opadajuće"</string>
+    <string name="drawer_open" msgid="8071673398187261741">"Prikaži osnovne direktorijume"</string>
+    <string name="drawer_close" msgid="4263880768630848848">"Sakrij osnovne direktorijume"</string>
+    <string name="save_error" msgid="8631128801982095782">"Čuvanje dokumenta nije uspelo"</string>
+    <string name="create_error" msgid="3092144450044861994">"Pravljenje direktorijuma nije uspelo"</string>
+    <string name="query_error" msgid="6625421453613879336">"Učitavanje sadržaja trenutno nije moguće"</string>
+    <string name="root_recent" msgid="1080156975424341623">"Nedavno"</string>
+    <string name="root_available_bytes" msgid="8269870862691408864">"Slobodno je <xliff:g id="SIZE">%1$s</xliff:g>"</string>
+    <string name="root_type_service" msgid="6521366147466512289">"Usluge čuvanja"</string>
+    <string name="root_type_shortcut" msgid="6059343175525442279">"Prečice"</string>
+    <string name="root_type_device" msgid="1713604128005476585">"Uređaji"</string>
+    <string name="root_type_apps" msgid="8646073235029886342">"Još aplikacija"</string>
+    <string name="empty" msgid="5300254272613103004">"Nema stavki"</string>
+    <string name="no_results" msgid="2371026325236359209">"Nema podudaranja u %1$s"</string>
+    <string name="toast_no_application" msgid="7555319548595113121">"Otvaranje datoteke nije uspelo"</string>
+    <string name="toast_failed_delete" msgid="3453846588205817591">"Nije moguće izbrisati neke dokumente"</string>
+    <string name="share_via" msgid="8725082736005677161">"Deljenje preko"</string>
+    <string name="copy_notification_title" msgid="52256435625098456">"Kopiramo datoteke"</string>
+    <string name="move_notification_title" msgid="3173424987049347605">"Premeštamo datoteke"</string>
+    <string name="delete_notification_title" msgid="2512757431856830792">"Brišemo datoteke"</string>
+    <string name="copy_remaining" msgid="5390517377265177727">"Još <xliff:g id="DURATION">%s</xliff:g>"</string>
+    <plurals name="copy_begin" formatted="false" msgid="3926184736640418042">
+      <item quantity="one">Kopiramo <xliff:g id="COUNT_1">%1$d</xliff:g> datoteku.</item>
+      <item quantity="few">Kopiramo <xliff:g id="COUNT_1">%1$d</xliff:g> datoteke.</item>
+      <item quantity="other">Kopiramo <xliff:g id="COUNT_1">%1$d</xliff:g> datoteka.</item>
     </plurals>
-    <plurals name="move_begin" formatted="false" msgid="8430330882138871643">
-      <item quantity="one">Premešta se <xliff:g id="COUNT_1">%1$d</xliff:g> datoteka.</item>
-      <item quantity="few">Premeštaju se <xliff:g id="COUNT_1">%1$d</xliff:g> datoteke.</item>
-      <item quantity="other">Premešta se <xliff:g id="COUNT_1">%1$d</xliff:g> datoteka.</item>
+    <plurals name="move_begin" formatted="false" msgid="6049210105852581598">
+      <item quantity="one">Premeštamo <xliff:g id="COUNT_1">%1$d</xliff:g> datoteku.</item>
+      <item quantity="few">Premeštamo <xliff:g id="COUNT_1">%1$d</xliff:g> datoteke.</item>
+      <item quantity="other">Premeštamo <xliff:g id="COUNT_1">%1$d</xliff:g> datoteka.</item>
     </plurals>
-    <plurals name="deleting" formatted="false" msgid="5054338566802559411">
-      <item quantity="one">Briše se <xliff:g id="COUNT_1">%1$d</xliff:g> datoteka.</item>
-      <item quantity="few">Brišu se <xliff:g id="COUNT_1">%1$d</xliff:g> datoteke.</item>
-      <item quantity="other">Briše se <xliff:g id="COUNT_1">%1$d</xliff:g> datoteka.</item>
+    <plurals name="deleting" formatted="false" msgid="1347549374456757591">
+      <item quantity="one">Brišemo <xliff:g id="COUNT_1">%1$d</xliff:g> datoteku.</item>
+      <item quantity="few">Brišemo <xliff:g id="COUNT_1">%1$d</xliff:g> datoteke.</item>
+      <item quantity="other">Brišemo <xliff:g id="COUNT_1">%1$d</xliff:g> datoteka.</item>
     </plurals>
-    <string name="undo" msgid="7905788502491742328">"Opozovi"</string>
-    <string name="copy_preparing" msgid="3896202461003039386">"Priprema se kopiranje…"</string>
-    <string name="move_preparing" msgid="2772219441375531410">"Priprema se premeštanje..."</string>
-    <plurals name="copy_error_notification_title" formatted="false" msgid="5267616889076217261">
-      <item quantity="one">Nismo uspeli da kopiramo <xliff:g id="COUNT_1">%1$d</xliff:g> datoteku</item>
-      <item quantity="few">Nismo uspeli da kopiramo <xliff:g id="COUNT_1">%1$d</xliff:g> datoteke</item>
-      <item quantity="other">Nismo uspeli da kopiramo <xliff:g id="COUNT_1">%1$d</xliff:g> datoteka</item>
+    <string name="undo" msgid="2902438994196400565">"Opozovi"</string>
+    <string name="copy_preparing" msgid="5326063807006898223">"Pripremamo kopiranje…"</string>
+    <string name="move_preparing" msgid="8742573245485449429">"Pripremamo premeštanje…"</string>
+    <string name="delete_preparing" msgid="6513863752916028147">"Pripremamo brisanje…"</string>
+    <string name="delete_progress" msgid="2627631054702306423">"<xliff:g id="COUNT_0">%1$d</xliff:g>/<xliff:g id="TOTALCOUNT">%2$d</xliff:g>"</string>
+    <plurals name="copy_error_notification_title" formatted="false" msgid="7406207967429915000">
+      <item quantity="one">Kopiranje <xliff:g id="COUNT_1">%1$d</xliff:g> datoteke nije uspelo</item>
+      <item quantity="few">Kopiranje <xliff:g id="COUNT_1">%1$d</xliff:g> datoteke nije uspelo</item>
+      <item quantity="other">Kopiranje <xliff:g id="COUNT_1">%1$d</xliff:g> datoteka nije uspelo</item>
     </plurals>
-    <plurals name="move_error_notification_title" formatted="false" msgid="2779299594174898891">
-      <item quantity="one">Nije uspelo premeštanje <xliff:g id="COUNT_1">%1$d</xliff:g> datoteke</item>
-      <item quantity="few">Nije uspelo premeštanje <xliff:g id="COUNT_1">%1$d</xliff:g> datoteke</item>
-      <item quantity="other">Nije uspelo premeštanje <xliff:g id="COUNT_1">%1$d</xliff:g> datoteka</item>
+    <plurals name="move_error_notification_title" formatted="false" msgid="7841920776201038994">
+      <item quantity="one">Premeštanje <xliff:g id="COUNT_1">%1$d</xliff:g> datoteke nije uspelo</item>
+      <item quantity="few">Premeštanje <xliff:g id="COUNT_1">%1$d</xliff:g> datoteke nije uspelo</item>
+      <item quantity="other">Premeštanje <xliff:g id="COUNT_1">%1$d</xliff:g> datoteka nije uspelo</item>
     </plurals>
-    <string name="notification_touch_for_details" msgid="4483108577842961665">"Dodirnite da biste videli detalje"</string>
-    <string name="retry" msgid="7564024179122207376">"Pokušaj ponovo"</string>
-    <string name="copy_failure_alert_content" msgid="3715575000297709082">"Sledeće datoteke nisu kopirane: <xliff:g id="LIST">%1$s</xliff:g>"</string>
-    <string name="move_failure_alert_content" msgid="7151140279020481180">"Ove datoteke nisu premeštene: <xliff:g id="LIST">%1$s</xliff:g>"</string>
-    <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539">
+    <plurals name="delete_error_notification_title" formatted="false" msgid="4925525467677907298">
+      <item quantity="one">Brisanje <xliff:g id="COUNT_1">%1$d</xliff:g> datoteke nije uspelo</item>
+      <item quantity="few">Brisanje <xliff:g id="COUNT_1">%1$d</xliff:g> datoteke nije uspelo</item>
+      <item quantity="other">Brisanje <xliff:g id="COUNT_1">%1$d</xliff:g> datoteka nije uspelo</item>
+    </plurals>
+    <string name="notification_touch_for_details" msgid="2385563502445129570">"Dodirnite da biste pregledali detalje"</string>
+    <string name="close" msgid="905969391788869975">"Zatvori"</string>
+    <string name="copy_failure_alert_content" msgid="161721873402101825">"Sledeće datoteke nisu kopirane: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+    <string name="move_failure_alert_content" msgid="6586182218105304719">"Sledeće datoteke nisu premeštene: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+    <string name="delete_failure_alert_content" msgid="7856890428816304981">"Sledeće datoteke nisu izbrisane: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+    <string name="copy_converted_warning_content" msgid="6481928162944612074">"Ove datoteke su konvertovane u drugi format: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+    <plurals name="clipboard_files_clipped" formatted="false" msgid="139644798886220070">
       <item quantity="one">Kopirali ste <xliff:g id="COUNT_1">%1$d</xliff:g> datoteku u privremenu memoriju.</item>
       <item quantity="few">Kopirali ste <xliff:g id="COUNT_1">%1$d</xliff:g> datoteke u privremenu memoriju.</item>
       <item quantity="other">Kopirali ste <xliff:g id="COUNT_1">%1$d</xliff:g> datoteka u privremenu memoriju.</item>
     </plurals>
-    <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Izabrane datoteke ne mogu da se nalepe na ovoj lokaciji."</string>
+    <string name="clipboard_files_cannot_paste" msgid="5700451161181106925">"Izabrane datoteke ne mogu da se nalepe na ovoj lokaciji."</string>
+    <string name="menu_rename" msgid="1883113442688817554">"Preimenuj"</string>
+    <string name="rename_error" msgid="6700093173508118635">"Preimenovanje dokumenta nije uspelo"</string>
+    <string name="menu_eject_root" msgid="9215040039374893613">"Izbaci"</string>
+    <string name="notification_copy_files_converted_title" msgid="6916768494891833365">"Neke datoteke su konvertovane"</string>
+    <string name="open_external_dialog_request" msgid="8173558471322861268">"Želite li da dozvolite aplikaciji <xliff:g id="APPNAME"><b>^1</b></xliff:g> da pristupa direktorijumu <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> na memorijskom prostoru <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string>
+    <string name="open_external_dialog_request_primary_volume" msgid="2240992164087948176">"Želite li da dozvolite aplikaciji <xliff:g id="APPNAME"><b>^1</b></xliff:g> da pristupa direktorijumu <xliff:g id="DIRECTORY"><i>^2</i></xliff:g>?"</string>
+    <string name="open_external_dialog_root_request" msgid="6776729293982633">"Želite li da dozvolite aplikaciji <xliff:g id="APPNAME"><b>^1</b></xliff:g> da pristupa podacima, uključujući slike i video snimke, na memorijskom prostoru <xliff:g id="STORAGE"><i>^2</i></xliff:g>?"</string>
+    <string name="never_ask_again" msgid="525908236522201138">"Ne pitaj ponovo"</string>
+    <string name="allow" msgid="1275746941353040309">"Dozvoli"</string>
+    <string name="deny" msgid="5127201668078153379">"Odbij"</string>
+    <plurals name="elements_selected" formatted="false" msgid="4448165978637163692">
+      <item quantity="one">Izabrana je <xliff:g id="COUNT_1">%1$d</xliff:g> stavka</item>
+      <item quantity="few">Izabrane su <xliff:g id="COUNT_1">%1$d</xliff:g> stavke</item>
+      <item quantity="other">Izabrano je <xliff:g id="COUNT_1">%1$d</xliff:g> stavki</item>
+    </plurals>
+    <plurals name="elements_dragged" formatted="false" msgid="5932571296037626279">
+      <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> stavka</item>
+      <item quantity="few"><xliff:g id="COUNT_1">%1$d</xliff:g> stavke</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> stavki</item>
+    </plurals>
+    <string name="delete_filename_confirmation_message" msgid="8338069763240613258">"Želite li da izbrišete „<xliff:g id="NAME">%1$s</xliff:g>“?"</string>
+    <string name="delete_foldername_confirmation_message" msgid="9084085260877704140">"Želite li da izbrišete direktorijum „<xliff:g id="NAME">%1$s</xliff:g>“ i njegov sadržaj?"</string>
+    <plurals name="delete_files_confirmation_message" formatted="false" msgid="4866664063250034142">
+      <item quantity="one">Želite li da izbrišete <xliff:g id="COUNT_1">%1$d</xliff:g> datoteku?</item>
+      <item quantity="few">Želite li da izbrišete <xliff:g id="COUNT_1">%1$d</xliff:g> datoteke?</item>
+      <item quantity="other">Želite li da izbrišete <xliff:g id="COUNT_1">%1$d</xliff:g> datoteka?</item>
+    </plurals>
+    <plurals name="delete_folders_confirmation_message" formatted="false" msgid="1028946402799686388">
+      <item quantity="one">Želite li da izbrišete <xliff:g id="COUNT_1">%1$d</xliff:g> direktorijum i njihov sadržaj?</item>
+      <item quantity="few">Želite li da izbrišete <xliff:g id="COUNT_1">%1$d</xliff:g> direktorijuma i njihov sadržaj?</item>
+      <item quantity="other">Želite li da izbrišete <xliff:g id="COUNT_1">%1$d</xliff:g> direktorijuma i njihov sadržaj?</item>
+    </plurals>
+    <plurals name="delete_items_confirmation_message" formatted="false" msgid="7285090426511028179">
+      <item quantity="one">Želite li da izbrišete <xliff:g id="COUNT_1">%1$d</xliff:g> stavku?</item>
+      <item quantity="few">Želite li da izbrišete <xliff:g id="COUNT_1">%1$d</xliff:g> stavke?</item>
+      <item quantity="other">Želite li da izbrišete <xliff:g id="COUNT_1">%1$d</xliff:g> stavki?</item>
+    </plurals>
 </resources>
diff --git a/res/values-be-rBY/strings.xml b/res/values-be-rBY/strings.xml
new file mode 100644
index 0000000..2df2850
--- /dev/null
+++ b/res/values-be-rBY/strings.xml
@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_label" msgid="3303317181319900082">"Файлы"</string>
+    <string name="downloads_label" msgid="5462789470049501103">"Спампоўкі"</string>
+    <string name="title_open" msgid="3165686459158020921">"Адкрыць з"</string>
+    <string name="title_save" msgid="4384490653102710025">"Захаваць у"</string>
+    <string name="menu_create_dir" msgid="2413624798689091042">"Новая папка"</string>
+    <string name="menu_grid" msgid="1453636521731880680">"У выглядзе табліцы"</string>
+    <string name="menu_list" msgid="6714267452146410402">"У выглядзе спіса"</string>
+    <string name="menu_sort" msgid="6754410552665101834">"Сартаваць па"</string>
+    <string name="menu_search" msgid="1876699106790719849">"Пошук"</string>
+    <string name="menu_settings" msgid="6520844520117939047">"Налады сховішча"</string>
+    <string name="menu_open" msgid="9092138100049759315">"Адкрыць"</string>
+    <string name="menu_save" msgid="5195367497138965168">"Захаваць"</string>
+    <string name="menu_share" msgid="4307140947108068356">"Абагуліць"</string>
+    <string name="menu_delete" msgid="1022254131543256626">"Выдаліць"</string>
+    <string name="menu_select_all" msgid="7600576812185570403">"Выбраць усе"</string>
+    <string name="menu_copy" msgid="7404820171352314754">"Капіраваць у…"</string>
+    <string name="menu_move" msgid="2310760789561129882">"Перамясціць у…"</string>
+    <string name="menu_new_window" msgid="2947837751796109126">"Новае акно"</string>
+    <string name="menu_cut_to_clipboard" msgid="2878752142015026229">"Выразаць"</string>
+    <string name="menu_copy_to_clipboard" msgid="5064081159073330776">"Капіраваць"</string>
+    <string name="menu_paste_from_clipboard" msgid="360947260414135827">"Уставіць"</string>
+    <string name="menu_advanced_show" msgid="7558626506462906726">"Паказаць унутр. сховішча"</string>
+    <string name="menu_advanced_hide" msgid="6488381508009246334">"Схаваць унутр. сховішча"</string>
+    <string name="menu_file_size_show" msgid="8035723306878852180">"Паказаць памеры файлаў"</string>
+    <string name="menu_file_size_hide" msgid="8953697126109694855">"Схаваць памеры файлаў"</string>
+    <string name="button_select" msgid="240863497069321364">"Выбраць"</string>
+    <string name="button_copy" msgid="8219059853840996027">"Капіраваць"</string>
+    <string name="button_move" msgid="8596460499325291272">"Перамясціць"</string>
+    <string name="button_dismiss" msgid="7235249361023803349">"Адхіліць"</string>
+    <string name="button_retry" msgid="4011461781916631389">"Паўтарыць спробу"</string>
+    <string name="sort_name" msgid="6790411054171883704">"Па назве"</string>
+    <string name="sort_date" msgid="3237147045109806231">"Па даце змянення"</string>
+    <string name="sort_size" msgid="5532930542340076266">"Па памеры"</string>
+    <string name="column_name" msgid="4078850838520640399">"Імя"</string>
+    <string name="column_summary" msgid="1540962781310003494">"Кароткае апісанне"</string>
+    <string name="column_date" msgid="5244069131770543137">"Зменены"</string>
+    <string name="column_size" msgid="3426180342785653748">"Памер"</string>
+    <string name="sort_direction_ascending" msgid="5882787683763248102">"Па ўзрастанні"</string>
+    <string name="sort_direction_descending" msgid="1729187589765894076">"Па ўбыванні"</string>
+    <string name="drawer_open" msgid="8071673398187261741">"Паказаць каранёвыя папкі"</string>
+    <string name="drawer_close" msgid="4263880768630848848">"Схаваць каранёвыя папкі"</string>
+    <string name="save_error" msgid="8631128801982095782">"Не атрымалася захаваць дакумент"</string>
+    <string name="create_error" msgid="3092144450044861994">"Не атрымалася стварыць папку"</string>
+    <string name="query_error" msgid="6625421453613879336">"Зараз немагчыма загрузіць змесціва"</string>
+    <string name="root_recent" msgid="1080156975424341623">"Апошнія"</string>
+    <string name="root_available_bytes" msgid="8269870862691408864">"<xliff:g id="SIZE">%1$s</xliff:g> свабодна"</string>
+    <string name="root_type_service" msgid="6521366147466512289">"Службы захоўвання"</string>
+    <string name="root_type_shortcut" msgid="6059343175525442279">"Ярлыкі"</string>
+    <string name="root_type_device" msgid="1713604128005476585">"Прылады"</string>
+    <string name="root_type_apps" msgid="8646073235029886342">"Іншыя праграмы"</string>
+    <string name="empty" msgid="5300254272613103004">"Няма элементаў"</string>
+    <string name="no_results" msgid="2371026325236359209">"Няма супадзенняў у %1$s"</string>
+    <string name="toast_no_application" msgid="7555319548595113121">"Немагчыма адкрыць файл"</string>
+    <string name="toast_failed_delete" msgid="3453846588205817591">"Немагчыма выдаліць некаторыя дакументы"</string>
+    <string name="share_via" msgid="8725082736005677161">"Абагуліць праз"</string>
+    <string name="copy_notification_title" msgid="52256435625098456">"Капіраванне файлаў"</string>
+    <string name="move_notification_title" msgid="3173424987049347605">"Перамяшчэнне файлаў"</string>
+    <string name="delete_notification_title" msgid="2512757431856830792">"Выдаленне файлаў"</string>
+    <string name="copy_remaining" msgid="5390517377265177727">"Засталося <xliff:g id="DURATION">%s</xliff:g>"</string>
+    <plurals name="copy_begin" formatted="false" msgid="3926184736640418042">
+      <item quantity="one">Ідзе капіраванне <xliff:g id="COUNT_1">%1$d</xliff:g> файла.</item>
+      <item quantity="few">Ідзе капіраванне <xliff:g id="COUNT_1">%1$d</xliff:g> файлаў.</item>
+      <item quantity="many">Ідзе капіраванне <xliff:g id="COUNT_1">%1$d</xliff:g> файлаў.</item>
+      <item quantity="other">Ідзе капіраванне <xliff:g id="COUNT_1">%1$d</xliff:g> файла.</item>
+    </plurals>
+    <plurals name="move_begin" formatted="false" msgid="6049210105852581598">
+      <item quantity="one">Перамяшчаецца <xliff:g id="COUNT_1">%1$d</xliff:g> файл.</item>
+      <item quantity="few">Перамяшчаюцца <xliff:g id="COUNT_1">%1$d</xliff:g> файлы.</item>
+      <item quantity="many">Перамяшчаюцца <xliff:g id="COUNT_1">%1$d</xliff:g> файлаў.</item>
+      <item quantity="other">Перамяшчаюцца <xliff:g id="COUNT_1">%1$d</xliff:g> файла.</item>
+    </plurals>
+    <plurals name="deleting" formatted="false" msgid="1347549374456757591">
+      <item quantity="one">Ідзе выдаленне <xliff:g id="COUNT_1">%1$d</xliff:g> файла.</item>
+      <item quantity="few">Ідзе выдаленне <xliff:g id="COUNT_1">%1$d</xliff:g> файлаў.</item>
+      <item quantity="many">Ідзе выдаленне <xliff:g id="COUNT_1">%1$d</xliff:g> файлаў.</item>
+      <item quantity="other">Ідзе выдаленне <xliff:g id="COUNT_1">%1$d</xliff:g> файла.</item>
+    </plurals>
+    <string name="undo" msgid="2902438994196400565">"Адрабіць"</string>
+    <string name="copy_preparing" msgid="5326063807006898223">"Ідзе падрыхтоўка да капіравання…"</string>
+    <string name="move_preparing" msgid="8742573245485449429">"Падрыхтоўваецца перамяшчэнне…"</string>
+    <string name="delete_preparing" msgid="6513863752916028147">"Ідзе падрыхтоўка да выдалення…"</string>
+    <string name="delete_progress" msgid="2627631054702306423">"<xliff:g id="COUNT_0">%1$d</xliff:g> / <xliff:g id="TOTALCOUNT">%2$d</xliff:g>"</string>
+    <plurals name="copy_error_notification_title" formatted="false" msgid="7406207967429915000">
+      <item quantity="one">Не атрымалася скапіраваць <xliff:g id="COUNT_1">%1$d</xliff:g> файл</item>
+      <item quantity="few">Не атрымалася скапіраваць <xliff:g id="COUNT_1">%1$d</xliff:g> файлы</item>
+      <item quantity="many">Не атрымалася скапіраваць <xliff:g id="COUNT_1">%1$d</xliff:g> файлаў</item>
+      <item quantity="other">Не атрымалася скапіраваць <xliff:g id="COUNT_1">%1$d</xliff:g> файла</item>
+    </plurals>
+    <plurals name="move_error_notification_title" formatted="false" msgid="7841920776201038994">
+      <item quantity="one">Не атрымалася перамясціць <xliff:g id="COUNT_1">%1$d</xliff:g> файл</item>
+      <item quantity="few">Не атрымалася перамясціць <xliff:g id="COUNT_1">%1$d</xliff:g> файлы</item>
+      <item quantity="many">Не атрымалася перамясціць <xliff:g id="COUNT_1">%1$d</xliff:g> файлаў</item>
+      <item quantity="other">Не атрымалася перамясціць <xliff:g id="COUNT_1">%1$d</xliff:g> файла</item>
+    </plurals>
+    <plurals name="delete_error_notification_title" formatted="false" msgid="4925525467677907298">
+      <item quantity="one">Не атрымалася выдаліць <xliff:g id="COUNT_1">%1$d</xliff:g> файл</item>
+      <item quantity="few">Не атрымалася выдаліць <xliff:g id="COUNT_1">%1$d</xliff:g> файлы</item>
+      <item quantity="many">Не атрымалася выдаліць <xliff:g id="COUNT_1">%1$d</xliff:g> файлаў</item>
+      <item quantity="other">Не атрымалася выдаліць <xliff:g id="COUNT_1">%1$d</xliff:g> файла</item>
+    </plurals>
+    <string name="notification_touch_for_details" msgid="2385563502445129570">"Дакраніцеся, каб праглядзець больш падрабязна"</string>
+    <string name="close" msgid="905969391788869975">"Закрыць"</string>
+    <string name="copy_failure_alert_content" msgid="161721873402101825">"Не былі скапіраваны наступныя файлы: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+    <string name="move_failure_alert_content" msgid="6586182218105304719">"Не былі перамешчаны наступныя файлы: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+    <string name="delete_failure_alert_content" msgid="7856890428816304981">"Не былі выдалены наступныя файлы: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+    <string name="copy_converted_warning_content" msgid="6481928162944612074">"Гэтыя файлы былі пераўтвораны ў іншы фармат: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+    <plurals name="clipboard_files_clipped" formatted="false" msgid="139644798886220070">
+      <item quantity="one">У буфер абмену скапіраваны <xliff:g id="COUNT_1">%1$d</xliff:g> файл.</item>
+      <item quantity="few">У буфер абмену скапіраваны <xliff:g id="COUNT_1">%1$d</xliff:g> файлы.</item>
+      <item quantity="many">У буфер абмену скапіраваны <xliff:g id="COUNT_1">%1$d</xliff:g> файлаў.</item>
+      <item quantity="other">У буфер абмену скапіраваны <xliff:g id="COUNT_1">%1$d</xliff:g> файла.</item>
+    </plurals>
+    <string name="clipboard_files_cannot_paste" msgid="5700451161181106925">"Немагчыма ўставіць выбраныя файлы ў гэта месца."</string>
+    <string name="menu_rename" msgid="1883113442688817554">"Перайменаваць"</string>
+    <string name="rename_error" msgid="6700093173508118635">"Не атрымалася перайменаваць дакумент"</string>
+    <string name="menu_eject_root" msgid="9215040039374893613">"Выняць"</string>
+    <string name="notification_copy_files_converted_title" msgid="6916768494891833365">"Некаторыя файлы былі пераўтвораны"</string>
+    <string name="open_external_dialog_request" msgid="8173558471322861268">"Даць праграме <xliff:g id="APPNAME"><b>^1</b></xliff:g> доступ да каталога <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> у <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string>
+    <string name="open_external_dialog_request_primary_volume" msgid="2240992164087948176">"Даць праграме <xliff:g id="APPNAME"><b>^1</b></xliff:g> доступ да каталога <xliff:g id="DIRECTORY"><i>^2</i></xliff:g>?"</string>
+    <string name="open_external_dialog_root_request" msgid="6776729293982633">"Даць праграме <xliff:g id="APPNAME"><b>^1</b></xliff:g> доступ да вашых даных, у тым ліку фатаграфій і відэа, у <xliff:g id="STORAGE"><i>^2</i></xliff:g>?"</string>
+    <string name="never_ask_again" msgid="525908236522201138">"Больш не пытацца"</string>
+    <string name="allow" msgid="1275746941353040309">"Дазволіць"</string>
+    <string name="deny" msgid="5127201668078153379">"Адмовіць"</string>
+    <plurals name="elements_selected" formatted="false" msgid="4448165978637163692">
+      <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> выбраны</item>
+      <item quantity="few"><xliff:g id="COUNT_1">%1$d</xliff:g> выбраны</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%1$d</xliff:g> выбраны</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> выбраны</item>
+    </plurals>
+    <plurals name="elements_dragged" formatted="false" msgid="5932571296037626279">
+      <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> элемент</item>
+      <item quantity="few"><xliff:g id="COUNT_1">%1$d</xliff:g> элементы</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%1$d</xliff:g> элементаў</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> элемента</item>
+    </plurals>
+    <string name="delete_filename_confirmation_message" msgid="8338069763240613258">"Выдаліць \"<xliff:g id="NAME">%1$s</xliff:g>\"?"</string>
+    <string name="delete_foldername_confirmation_message" msgid="9084085260877704140">"Выдаліць папку \"<xliff:g id="NAME">%1$s</xliff:g>\" і яе змесціва?"</string>
+    <plurals name="delete_files_confirmation_message" formatted="false" msgid="4866664063250034142">
+      <item quantity="one">Выдаліць <xliff:g id="COUNT_1">%1$d</xliff:g> файл?</item>
+      <item quantity="few">Выдаліць <xliff:g id="COUNT_1">%1$d</xliff:g> файлы?</item>
+      <item quantity="many">Выдаліць <xliff:g id="COUNT_1">%1$d</xliff:g> файлаў?</item>
+      <item quantity="other">Выдаліць <xliff:g id="COUNT_1">%1$d</xliff:g> файла?</item>
+    </plurals>
+    <plurals name="delete_folders_confirmation_message" formatted="false" msgid="1028946402799686388">
+      <item quantity="one">Выдаліць <xliff:g id="COUNT_1">%1$d</xliff:g> папку і іх змесціва?</item>
+      <item quantity="few">Выдаліць <xliff:g id="COUNT_1">%1$d</xliff:g> папкі і іх змесціва?</item>
+      <item quantity="many">Выдаліць <xliff:g id="COUNT_1">%1$d</xliff:g> папак і іх змесціва?</item>
+      <item quantity="other">Выдаліць <xliff:g id="COUNT_1">%1$d</xliff:g> папкі і іх змесціва?</item>
+    </plurals>
+    <plurals name="delete_items_confirmation_message" formatted="false" msgid="7285090426511028179">
+      <item quantity="one">Выдаліць <xliff:g id="COUNT_1">%1$d</xliff:g> элемент?</item>
+      <item quantity="few">Выдаліць <xliff:g id="COUNT_1">%1$d</xliff:g> элементы?</item>
+      <item quantity="many">Выдаліць <xliff:g id="COUNT_1">%1$d</xliff:g> элементаў?</item>
+      <item quantity="other">Выдаліць <xliff:g id="COUNT_1">%1$d</xliff:g> элемента?</item>
+    </plurals>
+</resources>
diff --git a/res/values-bs-rBA/strings.xml b/res/values-bs-rBA/strings.xml
new file mode 100644
index 0000000..01a27f3
--- /dev/null
+++ b/res/values-bs-rBA/strings.xml
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_label" msgid="3303317181319900082">"Fajlovi"</string>
+    <string name="downloads_label" msgid="5462789470049501103">"Preuzimanja"</string>
+    <string name="title_open" msgid="3165686459158020921">"Otvori iz"</string>
+    <string name="title_save" msgid="4384490653102710025">"Sačuvaj u"</string>
+    <string name="menu_create_dir" msgid="2413624798689091042">"Nova fascikla"</string>
+    <string name="menu_grid" msgid="1453636521731880680">"Prikaz u vidu mreže"</string>
+    <string name="menu_list" msgid="6714267452146410402">"Prikaz u vidu liste"</string>
+    <string name="menu_sort" msgid="6754410552665101834">"Poredaj po"</string>
+    <string name="menu_search" msgid="1876699106790719849">"Pretraži"</string>
+    <string name="menu_settings" msgid="6520844520117939047">"Postavke pohrane"</string>
+    <string name="menu_open" msgid="9092138100049759315">"Otvori"</string>
+    <string name="menu_save" msgid="5195367497138965168">"Sačuvaj"</string>
+    <string name="menu_share" msgid="4307140947108068356">"Podijeli"</string>
+    <string name="menu_delete" msgid="1022254131543256626">"Izbriši"</string>
+    <string name="menu_select_all" msgid="7600576812185570403">"Odaberi sve"</string>
+    <string name="menu_copy" msgid="7404820171352314754">"Kopiraj na…"</string>
+    <string name="menu_move" msgid="2310760789561129882">"Premjesti u…"</string>
+    <string name="menu_new_window" msgid="2947837751796109126">"Novi prozor"</string>
+    <string name="menu_cut_to_clipboard" msgid="2878752142015026229">"Izreži"</string>
+    <string name="menu_copy_to_clipboard" msgid="5064081159073330776">"Kopiraj"</string>
+    <string name="menu_paste_from_clipboard" msgid="360947260414135827">"Zalijepi"</string>
+    <string name="menu_advanced_show" msgid="7558626506462906726">"Prikaži unutrašnju mem."</string>
+    <string name="menu_advanced_hide" msgid="6488381508009246334">"Sakrij unutrašnju mem."</string>
+    <string name="menu_file_size_show" msgid="8035723306878852180">"Prikaži veličinu fajla"</string>
+    <string name="menu_file_size_hide" msgid="8953697126109694855">"Sakrij veličinu fajla"</string>
+    <string name="button_select" msgid="240863497069321364">"Odaberi"</string>
+    <string name="button_copy" msgid="8219059853840996027">"Kopiraj"</string>
+    <string name="button_move" msgid="8596460499325291272">"Premjesti"</string>
+    <string name="button_dismiss" msgid="7235249361023803349">"Odbaci"</string>
+    <string name="button_retry" msgid="4011461781916631389">"Pokušajte ponovo"</string>
+    <string name="sort_name" msgid="6790411054171883704">"Po nazivu"</string>
+    <string name="sort_date" msgid="3237147045109806231">"Po datumu izmjene"</string>
+    <string name="sort_size" msgid="5532930542340076266">"Po veličini"</string>
+    <string name="column_name" msgid="4078850838520640399">"Ime"</string>
+    <string name="column_summary" msgid="1540962781310003494">"Sažetak"</string>
+    <string name="column_date" msgid="5244069131770543137">"Izmijenjeno"</string>
+    <string name="column_size" msgid="3426180342785653748">"Veličina"</string>
+    <string name="sort_direction_ascending" msgid="5882787683763248102">"Rastuće"</string>
+    <string name="sort_direction_descending" msgid="1729187589765894076">"Opadajuće"</string>
+    <string name="drawer_open" msgid="8071673398187261741">"Prikaži korijenske fordere"</string>
+    <string name="drawer_close" msgid="4263880768630848848">"Sakrij korijenske foldere"</string>
+    <string name="save_error" msgid="8631128801982095782">"Dokument nije pohranjen"</string>
+    <string name="create_error" msgid="3092144450044861994">"Mapa nije kreirana"</string>
+    <string name="query_error" msgid="6625421453613879336">"Trenutno nije moguće učitati sadržaj"</string>
+    <string name="root_recent" msgid="1080156975424341623">"Nedavno"</string>
+    <string name="root_available_bytes" msgid="8269870862691408864">"<xliff:g id="SIZE">%1$s</xliff:g> slobodno"</string>
+    <string name="root_type_service" msgid="6521366147466512289">"Usluge pohranjivanja"</string>
+    <string name="root_type_shortcut" msgid="6059343175525442279">"Prečice"</string>
+    <string name="root_type_device" msgid="1713604128005476585">"Uređaji"</string>
+    <string name="root_type_apps" msgid="8646073235029886342">"Više aplikacija"</string>
+    <string name="empty" msgid="5300254272613103004">"Nema stavki"</string>
+    <string name="no_results" msgid="2371026325236359209">"Nema podudarnih rezultata u %1$s"</string>
+    <string name="toast_no_application" msgid="7555319548595113121">"Nije moguće otvoriti fajl"</string>
+    <string name="toast_failed_delete" msgid="3453846588205817591">"Nije moguće izbrisati neke dokumente"</string>
+    <string name="share_via" msgid="8725082736005677161">"Podijeli koristeći aplikaciju"</string>
+    <string name="copy_notification_title" msgid="52256435625098456">"Kopiraju se fajlovi"</string>
+    <string name="move_notification_title" msgid="3173424987049347605">"Premještanje fajlova"</string>
+    <string name="delete_notification_title" msgid="2512757431856830792">"Brisanje fajlova"</string>
+    <string name="copy_remaining" msgid="5390517377265177727">"Još <xliff:g id="DURATION">%s</xliff:g>"</string>
+    <plurals name="copy_begin" formatted="false" msgid="3926184736640418042">
+      <item quantity="one">Kopira se <xliff:g id="COUNT_1">%1$d</xliff:g> fajl.</item>
+      <item quantity="few">Kopiraju se <xliff:g id="COUNT_1">%1$d</xliff:g> fajla.</item>
+      <item quantity="other">Kopira se <xliff:g id="COUNT_1">%1$d</xliff:g> fajlova.</item>
+    </plurals>
+    <plurals name="move_begin" formatted="false" msgid="6049210105852581598">
+      <item quantity="one">Premješta se <xliff:g id="COUNT_1">%1$d</xliff:g> fajl.</item>
+      <item quantity="few">Premještaju se <xliff:g id="COUNT_1">%1$d</xliff:g> fajla.</item>
+      <item quantity="other">Premješta se <xliff:g id="COUNT_1">%1$d</xliff:g> fajlova.</item>
+    </plurals>
+    <plurals name="deleting" formatted="false" msgid="1347549374456757591">
+      <item quantity="one">Briše se <xliff:g id="COUNT_1">%1$d</xliff:g> fajl.</item>
+      <item quantity="few">Brišu se <xliff:g id="COUNT_1">%1$d</xliff:g> fajla.</item>
+      <item quantity="other">Briše se <xliff:g id="COUNT_1">%1$d</xliff:g> fajlova.</item>
+    </plurals>
+    <string name="undo" msgid="2902438994196400565">"Opozovi radnju"</string>
+    <string name="copy_preparing" msgid="5326063807006898223">"Priprema se kopiranje…"</string>
+    <string name="move_preparing" msgid="8742573245485449429">"Priprema za premještanje…"</string>
+    <string name="delete_preparing" msgid="6513863752916028147">"Priprema za brisanje…"</string>
+    <string name="delete_progress" msgid="2627631054702306423">"<xliff:g id="COUNT_0">%1$d</xliff:g> / <xliff:g id="TOTALCOUNT">%2$d</xliff:g>"</string>
+    <plurals name="copy_error_notification_title" formatted="false" msgid="7406207967429915000">
+      <item quantity="one">Nije moguće kopirati <xliff:g id="COUNT_1">%1$d</xliff:g> fajl</item>
+      <item quantity="few">Nije moguće kopirati <xliff:g id="COUNT_1">%1$d</xliff:g> fajla</item>
+      <item quantity="other">Nije moguće kopirati <xliff:g id="COUNT_1">%1$d</xliff:g> fajlova</item>
+    </plurals>
+    <plurals name="move_error_notification_title" formatted="false" msgid="7841920776201038994">
+      <item quantity="one">Nije moguće premjestiti <xliff:g id="COUNT_1">%1$d</xliff:g> fajl</item>
+      <item quantity="few">Nije moguće premjestiti <xliff:g id="COUNT_1">%1$d</xliff:g> fajla</item>
+      <item quantity="other">Nije moguće premjestiti <xliff:g id="COUNT_1">%1$d</xliff:g> fajlova</item>
+    </plurals>
+    <plurals name="delete_error_notification_title" formatted="false" msgid="4925525467677907298">
+      <item quantity="one">Nije bilo moguće izbrisati <xliff:g id="COUNT_1">%1$d</xliff:g> fajl</item>
+      <item quantity="few">Nije bilo moguće izbrisati <xliff:g id="COUNT_1">%1$d</xliff:g> fajla</item>
+      <item quantity="other">Nije bilo moguće izbrisati <xliff:g id="COUNT_1">%1$d</xliff:g> fajlova</item>
+    </plurals>
+    <string name="notification_touch_for_details" msgid="2385563502445129570">"Dodirnite za prikaz detalja"</string>
+    <string name="close" msgid="905969391788869975">"Zatvori"</string>
+    <string name="copy_failure_alert_content" msgid="161721873402101825">"Nisu kopirani sljedeći fajlovi: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+    <string name="move_failure_alert_content" msgid="6586182218105304719">"Nisu premješteni sljedeći fajlovi: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+    <string name="delete_failure_alert_content" msgid="7856890428816304981">"Nisu izbrisani sljedeći fajlovi: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+    <string name="copy_converted_warning_content" msgid="6481928162944612074">"Ovi fajlovi su pretvoreni u drugi format: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+    <plurals name="clipboard_files_clipped" formatted="false" msgid="139644798886220070">
+      <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> fajl je kopiran u međuspremnik.</item>
+      <item quantity="few"><xliff:g id="COUNT_1">%1$d</xliff:g> fajla su kopirana u međuspremnik.</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> fajlova je kopirano u međuspremnik.</item>
+    </plurals>
+    <string name="clipboard_files_cannot_paste" msgid="5700451161181106925">"Odabrane fajlove nije moguće zalijepiti na ovu lokaciju."</string>
+    <string name="menu_rename" msgid="1883113442688817554">"Preimenuj"</string>
+    <string name="rename_error" msgid="6700093173508118635">"Dokument nije preimenovan"</string>
+    <string name="menu_eject_root" msgid="9215040039374893613">"Izbaci"</string>
+    <string name="notification_copy_files_converted_title" msgid="6916768494891833365">"Neki fajlovi su pretvoreni u drugi format"</string>
+    <string name="open_external_dialog_request" msgid="8173558471322861268">"Želite li aplikaciji <xliff:g id="APPNAME"><b>^1</b></xliff:g> odobriti pristup direktoriju <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> na pohrani <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string>
+    <string name="open_external_dialog_request_primary_volume" msgid="2240992164087948176">"Želite li aplikaciji <xliff:g id="APPNAME"><b>^1</b></xliff:g> odobriti pristup direktoriju <xliff:g id="DIRECTORY"><i>^2</i></xliff:g>?"</string>
+    <string name="open_external_dialog_root_request" msgid="6776729293982633">"Želite li aplikaciji <xliff:g id="APPNAME"><b>^1</b></xliff:g> odobriti pristup svojim podacima, uključujući fotografije i videozapise, na pohrani: <xliff:g id="STORAGE"><i>^2</i></xliff:g>?"</string>
+    <string name="never_ask_again" msgid="525908236522201138">"Ne pitaj ponovo"</string>
+    <string name="allow" msgid="1275746941353040309">"Dozvoli"</string>
+    <string name="deny" msgid="5127201668078153379">"Odbij"</string>
+    <plurals name="elements_selected" formatted="false" msgid="4448165978637163692">
+      <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> odabran</item>
+      <item quantity="few"><xliff:g id="COUNT_1">%1$d</xliff:g> odabrana</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> odabranih</item>
+    </plurals>
+    <plurals name="elements_dragged" formatted="false" msgid="5932571296037626279">
+      <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> stavka</item>
+      <item quantity="few"><xliff:g id="COUNT_1">%1$d</xliff:g> stavke</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> stavki</item>
+    </plurals>
+    <string name="delete_filename_confirmation_message" msgid="8338069763240613258">"Želite li izbrisati \"<xliff:g id="NAME">%1$s</xliff:g>\"?"</string>
+    <string name="delete_foldername_confirmation_message" msgid="9084085260877704140">"Želite li izbrisati folder \"<xliff:g id="NAME">%1$s</xliff:g>\" i njegov sadržaj?"</string>
+    <plurals name="delete_files_confirmation_message" formatted="false" msgid="4866664063250034142">
+      <item quantity="one">Želite li izbrisati <xliff:g id="COUNT_1">%1$d</xliff:g> fajl?</item>
+      <item quantity="few">Želite li izbrisati <xliff:g id="COUNT_1">%1$d</xliff:g> fajla?</item>
+      <item quantity="other">Želite li izbrisati <xliff:g id="COUNT_1">%1$d</xliff:g> fajlova.</item>
+    </plurals>
+    <plurals name="delete_folders_confirmation_message" formatted="false" msgid="1028946402799686388">
+      <item quantity="one">Želite li izbrisati <xliff:g id="COUNT_1">%1$d</xliff:g> folder i njihov sadržaj?</item>
+      <item quantity="few">Želite li izbrisati <xliff:g id="COUNT_1">%1$d</xliff:g> foldera i njihov sadržaj?</item>
+      <item quantity="other">Želite li izbrisati <xliff:g id="COUNT_1">%1$d</xliff:g> foldera i njihov sadržaj?</item>
+    </plurals>
+    <plurals name="delete_items_confirmation_message" formatted="false" msgid="7285090426511028179">
+      <item quantity="one">Želite li izbrisati <xliff:g id="COUNT_1">%1$d</xliff:g> stavku?</item>
+      <item quantity="few">Želite li izbrisati <xliff:g id="COUNT_1">%1$d</xliff:g> stavke?</item>
+      <item quantity="other">Želite li izbrisati <xliff:g id="COUNT_1">%1$d</xliff:g> stavki?</item>
+    </plurals>
+</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index bba665e..8cc864e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -36,7 +36,7 @@
     <string name="menu_sort">Sort by</string>
     <!-- Menu item that enters a mode to search for documents [CHAR LIMIT=24] -->
     <string name="menu_search">Search</string>
-    <!-- Menu item that enters activity to change settings for current root [CHAR LIMIT=24] -->
+    <!-- Menu item that opens settings/options for a device (like an SD card). [CHAR LIMIT=24] -->
     <string name="menu_settings">Storage settings</string>
 
     <!-- Menu item title that opens the selected documents [CHAR LIMIT=24] -->
@@ -63,9 +63,11 @@
     <!-- Menu item title that pastes files from the clipboard [CHAR LIMIT=24] -->
     <string name="menu_paste_from_clipboard">Paste</string>
 
-    <!-- Menu item that reveals internal storage built into the device [CHAR LIMIT=24] -->
+    <!-- Translators asked for a length exemption for the show/hide internal storage strings.
+         Thus the CHAR LIMIT=24/30 deviation is 'splained. -->
+    <!-- Menu item that reveals internal storage built into the device [CHAR LIMIT=30] -->
     <string name="menu_advanced_show">Show internal storage</string>
-    <!-- Menu item that hides internal storage built into the device [CHAR LIMIT=24] -->
+    <!-- Menu item that hides internal storage built into the device [CHAR LIMIT=30] -->
     <string name="menu_advanced_hide">Hide internal storage</string>
 
     <!-- Menu item that reveals the sizes of displayed files [CHAR LIMIT=24] -->
diff --git a/src/com/android/documentsui/dirlist/DirectoryFragment.java b/src/com/android/documentsui/dirlist/DirectoryFragment.java
index 65ea6c7..5ecdb88 100644
--- a/src/com/android/documentsui/dirlist/DirectoryFragment.java
+++ b/src/com/android/documentsui/dirlist/DirectoryFragment.java
@@ -96,7 +96,6 @@
 import com.android.documentsui.clipping.DocumentClipper;
 import com.android.documentsui.clipping.UrisSupplier;
 import com.android.documentsui.dirlist.MultiSelectManager.Selection;
-import com.android.documentsui.dirlist.UserInputHandler.DocumentDetails;
 import com.android.documentsui.dirlist.header.TableHeaderController;
 import com.android.documentsui.model.DocumentInfo;
 import com.android.documentsui.model.RootInfo;
diff --git a/src/com/android/documentsui/dirlist/DocumentDetails.java b/src/com/android/documentsui/dirlist/DocumentDetails.java
new file mode 100644
index 0000000..27a2234
--- /dev/null
+++ b/src/com/android/documentsui/dirlist/DocumentDetails.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.documentsui.dirlist;
+
+import com.android.documentsui.Events.InputEvent;
+
+/**
+ * Interface providing a loose coupling between DocumentHolder.
+ */
+public interface DocumentDetails {
+    String getModelId();
+    int getAdapterPosition();
+    boolean isInSelectionHotspot(InputEvent event);
+}
diff --git a/src/com/android/documentsui/dirlist/DocumentHolder.java b/src/com/android/documentsui/dirlist/DocumentHolder.java
index c2b0bf2..d30d18c 100644
--- a/src/com/android/documentsui/dirlist/DocumentHolder.java
+++ b/src/com/android/documentsui/dirlist/DocumentHolder.java
@@ -30,12 +30,9 @@
 import com.android.documentsui.Events.InputEvent;
 import com.android.documentsui.R;
 import com.android.documentsui.State;
-import com.android.documentsui.dirlist.UserInputHandler.DocumentDetails;
 
 public abstract class DocumentHolder
-        extends RecyclerView.ViewHolder
-        implements View.OnKeyListener,
-        DocumentDetails {
+        extends RecyclerView.ViewHolder implements View.OnKeyListener, DocumentDetails {
 
     static final float DISABLED_ALPHA = 0.3f;
 
diff --git a/src/com/android/documentsui/dirlist/ListeningGestureDetector.java b/src/com/android/documentsui/dirlist/ListeningGestureDetector.java
index 85ff6ed..b743779 100644
--- a/src/com/android/documentsui/dirlist/ListeningGestureDetector.java
+++ b/src/com/android/documentsui/dirlist/ListeningGestureDetector.java
@@ -25,11 +25,9 @@
 import android.view.View;
 import android.view.View.OnTouchListener;
 
-import com.android.documentsui.Events;
-
-// Previously we listened to events with one class, only to bounce them forward
-// to GestureDetector. We're still doing that here, but with a single class
-// that reduces overall complexity in our glue code.
+// Receives event meant for both directory and empty view, and either pass them to
+// {@link UserInputHandler} for simple gestures (Single Tap, Long-Press), or intercept them for
+// other types of gestures (drag n' drop)
 final class ListeningGestureDetector extends GestureDetector
         implements OnItemTouchListener, OnTouchListener {
 
@@ -46,20 +44,13 @@
 
     @Override
     public boolean onInterceptTouchEvent(RecyclerView rv, MotionEvent e) {
-        // TODO: If possible, move this into UserInputHandler.
-        if (e.getAction() == MotionEvent.ACTION_DOWN && Events.isMouseEvent(e)) {
-            mInputHandler.setLastButtonState(e.getButtonState());
-        }
-
         // Detect drag events. When a drag is detected, intercept the rest of the gesture.
         View itemView = rv.findChildViewUnder(e.getX(), e.getY());
         if (itemView != null && mDragHelper.onTouch(itemView,  e)) {
             return true;
         }
-        // Forward unhandled events to the GestureDetector.
-        onTouchEvent(e);
-
-        return false;
+        // Forward unhandled events to UserInputHandler.
+        return onTouchEvent(e);
     }
 
     @Override
@@ -75,12 +66,10 @@
     @Override
     public void onRequestDisallowInterceptTouchEvent(boolean disallowIntercept) {}
 
-    // For mEmptyView right-click context menu
+    // For mEmptyView events
     @Override
     public boolean onTouch(View v, MotionEvent event) {
-        if (event.getButtonState() == MotionEvent.BUTTON_SECONDARY) {
-            return mInputHandler.onSingleRightClickUp(event);
-        }
-        return false;
+        // Pass events to UserInputHandler.
+        return onTouchEvent(event);
     }
 }
\ No newline at end of file
diff --git a/src/com/android/documentsui/dirlist/UserInputHandler.java b/src/com/android/documentsui/dirlist/UserInputHandler.java
index 07b0cd8..7324695 100644
--- a/src/com/android/documentsui/dirlist/UserInputHandler.java
+++ b/src/com/android/documentsui/dirlist/UserInputHandler.java
@@ -26,7 +26,6 @@
 
 import com.android.documentsui.Events;
 import com.android.documentsui.Events.InputEvent;
-import com.android.documentsui.dirlist.DocumentHolder.KeyboardEventListener;
 
 import java.util.function.Function;
 import java.util.function.Predicate;
@@ -36,7 +35,7 @@
  */
 public final class UserInputHandler<T extends InputEvent>
         extends GestureDetector.SimpleOnGestureListener
-        implements KeyboardEventListener {
+        implements DocumentHolder.KeyboardEventListener {
 
     private static final String TAG = "UserInputHandler";
 
@@ -77,6 +76,20 @@
     }
 
     @Override
+    public boolean onDown(MotionEvent e) {
+        try (T event = mEventConverter.apply(e)) {
+            return onDown(event);
+        }
+    }
+
+    @VisibleForTesting
+    boolean onDown(T event) {
+        return event.isMouseEvent()
+                ? mMouseDelegate.onDown(event)
+                : mTouchDelegate.onDown(event);
+    }
+
+    @Override
     public boolean onSingleTapUp(MotionEvent e) {
         try (T event = mEventConverter.apply(e)) {
             return onSingleTapUp(event);
@@ -133,9 +146,12 @@
         mTouchDelegate.onLongPress(event);
     }
 
-    public boolean onSingleRightClickUp(MotionEvent e) {
+    // Only events from RecyclerView are fed into UserInputHandler#onDown.
+    // ListeningGestureDetector#onTouch directly calls this method to support context menu in empty
+    // view
+    boolean onRightClick(MotionEvent e) {
         try (T event = mEventConverter.apply(e)) {
-            return mMouseDelegate.onSingleRightClickUp(event);
+            return mMouseDelegate.onRightClick(event);
         }
     }
 
@@ -144,11 +160,6 @@
         return mKeyListener.onKey(doc, keyCode, event);
     }
 
-    // TODO: Isolate this hack...see if we can't get this solved at the platform level.
-    public void setLastButtonState(int state) {
-        mMouseDelegate.setLastButtonState(state);
-    }
-
     private boolean activateDocument(DocumentDetails doc) {
         return mActivateHandler.accept(doc);
     }
@@ -170,6 +181,10 @@
 
     private final class TouchInputDelegate {
 
+        boolean onDown(T event) {
+            return false;
+        }
+
         boolean onSingleTapUp(T event) {
             if (!event.isOverItem()) {
                 if (DEBUG) Log.d(TAG, "Tap on non-item. Clearing selection.");
@@ -221,25 +236,28 @@
     }
 
     private final class MouseInputDelegate {
-
-        // From the RecyclerView, we get two events sent to
-        // ListeningGestureDetector#onInterceptTouchEvent on a mouse click; we first get an
-        // ACTION_DOWN Event for clicking on the mouse, and then an ACTION_UP event from releasing
-        // the mouse click. ACTION_UP event doesn't have information regarding the button (primary
-        // vs. secondary), so we have to save that somewhere first from ACTION_DOWN, and then reuse
-        // it later. The ACTION_DOWN event doesn't get forwarded to UserInputListener,
-        // so we have open up a public set method to set it.
-        private int mLastButtonState = -1;
-
-        // true when the previous event has consumed a right click motion event
-        private boolean mAteRightClick;
-
         // The event has been handled in onSingleTapUp
         private boolean mHandledTapUp;
+        // true when the previous event has consumed a right click motion event
+        private boolean mHandledOnDown;
+
+        boolean onDown(T event) {
+            if (event.isSecondaryButtonPressed()) {
+                assert(!mHandledOnDown);
+                mHandledOnDown = true;
+                return onRightClick(event);
+            }
+            return false;
+        }
 
         boolean onSingleTapUp(T event) {
-            if (eatRightClick()) {
-                return onSingleRightClickUp(event);
+
+            // See b/27377794. Since we don't get a button state back from UP events, we have to
+            // explicitly save this state to know whether something was previously handled by
+            // DOWN events or not.
+            if (mHandledOnDown) {
+                mHandledOnDown = false;
+                return false;
             }
 
             if (!event.isOverItem()) {
@@ -273,10 +291,6 @@
         }
 
         boolean onSingleTapConfirmed(T event) {
-            if (mAteRightClick) {
-                mAteRightClick = false;
-                return false;
-            }
             if (mHandledTapUp) {
                 mHandledTapUp = false;
                 return false;
@@ -317,23 +331,9 @@
             }
         }
 
-        private boolean onSingleRightClickUp(T event) {
+        private boolean onRightClick(T event) {
             return mRightClickHandler.apply(event);
         }
-
-        // hack alert from here through end of class.
-        private void setLastButtonState(int state) {
-            mLastButtonState = state;
-        }
-
-        private boolean eatRightClick() {
-            if (mLastButtonState == MotionEvent.BUTTON_SECONDARY) {
-                mLastButtonState = -1;
-                mAteRightClick = true;
-                return true;
-            }
-            return false;
-        }
     }
 
     private final class KeyInputHandler {
@@ -402,15 +402,6 @@
         }
     }
 
-    /**
-     * Class providing limited access to document view info.
-     */
-    public interface DocumentDetails {
-        String getModelId();
-        int getAdapterPosition();
-        boolean isInSelectionHotspot(InputEvent event);
-    }
-
     @FunctionalInterface
     interface EventHandler {
         boolean apply(InputEvent event);
diff --git a/tests/src/com/android/documentsui/TestInputEvent.java b/tests/src/com/android/documentsui/TestInputEvent.java
index e6936d6..5cd6514 100644
--- a/tests/src/com/android/documentsui/TestInputEvent.java
+++ b/tests/src/com/android/documentsui/TestInputEvent.java
@@ -105,6 +105,13 @@
         return e;
     }
 
+    public static TestInputEvent rightClick(int position) {
+        TestInputEvent e = new TestInputEvent(position);
+        e.mouseEvent = true;
+        e.secondaryButtonPressed = true;
+        return e;
+    }
+
     public static TestInputEvent shiftClick(int position) {
         TestInputEvent e = new TestInputEvent(position);
         e.mouseEvent = true;
diff --git a/tests/src/com/android/documentsui/dirlist/UserInputHandler_MouseTest.java b/tests/src/com/android/documentsui/dirlist/UserInputHandler_MouseTest.java
index 4c34546..c459830 100644
--- a/tests/src/com/android/documentsui/dirlist/UserInputHandler_MouseTest.java
+++ b/tests/src/com/android/documentsui/dirlist/UserInputHandler_MouseTest.java
@@ -22,7 +22,6 @@
 import android.view.MotionEvent;
 
 import com.android.documentsui.Events.InputEvent;
-import com.android.documentsui.dirlist.UserInputHandler.DocumentDetails;
 import com.android.documentsui.testing.TestEvent;
 import com.android.documentsui.testing.TestEvent.Builder;
 import com.android.documentsui.testing.TestPredicate;
@@ -88,6 +87,12 @@
     }
 
     @Test
+    public void testRightClickDown_StartsContextMenu() {
+        mInputHandler.onDown(mEvent.secondary().build());
+        mRightClickHandler.assertLastArgument(mEvent.secondary().build());
+    }
+
+    @Test
     public void testUnconfirmedClick_AddsToExistingSelection() {
         mInputHandler.onSingleTapConfirmed(mEvent.at(7).build());
 
diff --git a/tests/src/com/android/documentsui/dirlist/UserInputHandler_RangeTest.java b/tests/src/com/android/documentsui/dirlist/UserInputHandler_RangeTest.java
index 1d763f9..b3032f7 100644
--- a/tests/src/com/android/documentsui/dirlist/UserInputHandler_RangeTest.java
+++ b/tests/src/com/android/documentsui/dirlist/UserInputHandler_RangeTest.java
@@ -21,7 +21,6 @@
 import android.view.MotionEvent;
 
 import com.android.documentsui.Events.InputEvent;
-import com.android.documentsui.dirlist.UserInputHandler.DocumentDetails;
 import com.android.documentsui.testing.TestEvent;
 import com.android.documentsui.testing.TestEvent.Builder;
 import com.android.documentsui.testing.TestPredicate;
diff --git a/tests/src/com/android/documentsui/dirlist/UserInputHandler_TouchTest.java b/tests/src/com/android/documentsui/dirlist/UserInputHandler_TouchTest.java
index 2d1453e..b6e9306 100644
--- a/tests/src/com/android/documentsui/dirlist/UserInputHandler_TouchTest.java
+++ b/tests/src/com/android/documentsui/dirlist/UserInputHandler_TouchTest.java
@@ -22,7 +22,6 @@
 import android.view.MotionEvent;
 
 import com.android.documentsui.Events.InputEvent;
-import com.android.documentsui.dirlist.UserInputHandler.DocumentDetails;
 import com.android.documentsui.testing.TestEvent;
 import com.android.documentsui.testing.TestEvent.Builder;
 import com.android.documentsui.testing.TestPredicate;
diff --git a/tests/src/com/android/documentsui/testing/TestEvent.java b/tests/src/com/android/documentsui/testing/TestEvent.java
index 98fa2de..f56118e 100644
--- a/tests/src/com/android/documentsui/testing/TestEvent.java
+++ b/tests/src/com/android/documentsui/testing/TestEvent.java
@@ -18,7 +18,7 @@
 
 import com.android.documentsui.Events.InputEvent;
 import com.android.documentsui.TestInputEvent;
-import com.android.documentsui.dirlist.UserInputHandler.DocumentDetails;
+import com.android.documentsui.dirlist.DocumentDetails;
 
 /**
  * Events and DocDetails are closely related. For the pursposes of this test
@@ -125,6 +125,11 @@
             return this;
         }
 
+        public Builder secondary() {
+            mState.secondaryButtonPressed = true;
+            return this;
+        }
+
         public TestEvent build() {
             // Return a copy, so nobody can mess w/ our internal state.
             TestEvent e = new TestEvent();
@@ -132,6 +137,7 @@
             e.modelId = mState.modelId;
             e.shiftKeyDow = mState.shiftKeyDow;
             e.mouseEvent = mState.mouseEvent;
+            e.secondaryButtonPressed = mState.secondaryButtonPressed;
             return e;
         }
     }