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

@ -20,7 +20,7 @@
<string name="upload_progress_notification_title_finishing">%1$s igotzen bukatzen</string>
<string name="upload_failed_notification_title">%1$s igotzean akatsa</string>
<string name="upload_failed_notification_subtitle">Ukitu ikusteko</string>
<string name="title_activity_contributions">Nire igoerak</string>
<string name="title_activity_contributions" fuzzy="true">Nire igoerak</string>
<string name="contribution_state_queued">Itxoite-zerrendan</string>
<string name="contribution_state_failed">Hutsegitea</string>
<string name="contribution_state_in_progress">%1$d%% egina</string>
@ -46,7 +46,7 @@
<string name="categories_search_text_hint">Kategoriak bilatu</string>
<string name="menu_save_categories">Gorde</string>
<string name="refresh_button">Eguneratu</string>
<plurals name="contributions_subtitle">
<plurals name="contributions_subtitle" fuzzy="true">
<item quantity="zero">Oraindik igoerarik ez</item>
<item quantity="one">igoera 1</item>
<item quantity="other">%d igoera</item>
@ -117,4 +117,8 @@
<string name="become_a_tester_title">Beta testatzaile bihurtu</string>
<string name="use_wikidata">Wikidata erabili</string>
<string name="use_wikidata_summary">(Erne:hau kentzeak mugikorrak datu asko kontsumitzea ekar dezake)</string>
<string name="navigation_drawer_open">Ireki</string>
<string name="navigation_drawer_close">Itxi</string>
<string name="navigation_item_about">Honi buruz</string>
<string name="navigation_item_settings">Ezarpenak</string>
</resources>