Merge branch 'master' into harmonize-licenses-with-upload-wizard

This commit is contained in:
Adam Baso 2017-05-20 05:22:49 -05:00 committed by GitHub
commit 05515ab80c
84 changed files with 1234 additions and 988 deletions

View file

@ -18,7 +18,7 @@
<string name="upload_progress_notification_title_finishing">Hele a pau ka hoʻouka ʻana o %1$s</string>
<string name="upload_failed_notification_title">Ua hāʻule ʻo %1$s i ka hoʻouka ʻana</string>
<string name="upload_failed_notification_subtitle">Kīkē no ka ʻike ʻana</string>
<string name="title_activity_contributions">Kaʻu hoʻouka</string>
<string name="title_activity_contributions" fuzzy="true">Kaʻu hoʻouka</string>
<string name="contribution_state_queued">Kali</string>
<string name="contribution_state_failed">ʻule</string>
<string name="contribution_state_in_progress">%1$d%% pau</string>