Skip to content

Commit

Permalink
Merge pull request #811 from Gitsaibot/strings
Browse files Browse the repository at this point in the history
Update translations and resolve conflicts
  • Loading branch information
Gitsaibot authored Nov 29, 2020
2 parents 92dd9d4 + 404dce2 commit ded9895
Show file tree
Hide file tree
Showing 22 changed files with 548 additions and 302 deletions.
29 changes: 20 additions & 9 deletions res/values-ca/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@
<item quantity="other"><xliff:g id="count">%d</xliff:g> dies</item>
</plurals>
<plurals name="weekN">
<item quantity="other" msgid="8085184869561028365">"setmana <xliff:g id="COUNT">%d</xliff:g>"</item>
<item quantity="one">Setmana &lt;xliff:g xmlns:xliff=\"urn:oasis:names:tc:xliff:document:1.2\" id=\"COUNT\"&gt;%d&lt;/xliff:g&gt;</item>
<item quantity="other"></item>
</plurals>
<string name="calendar_refresh" msgid="6172731193680500025">"Actualitza"</string>
<string name="show_day_view" msgid="5782512782605466016">"Mostra el dia"</string>
Expand Down Expand Up @@ -108,9 +109,9 @@
<string name="quick_response_custom_msg" msgid="8792374208224108798">"Escriu la teva…"</string>
<string name="event_info_organizer" msgid="9138683335394832629">"Organitz.:"</string>
<string name="event_info_reminders_label" msgid="8913097552956388972">"Recordatoris"</string>
<string name="agenda_today" msgid="5965841338467422191">"avui, <xliff:g id="DATE">%1$s</xliff:g>"</string>
<string name="agenda_yesterday" msgid="4170964206728599693">"ahir, <xliff:g id="DATE">%1$s</xliff:g>"</string>
<string name="agenda_tomorrow" msgid="3893625470780723605">"demà, <xliff:g id="DATE">%1$s</xliff:g>"</string>
<string name="agenda_today" msgid="5965841338467422191">Avui, &lt;xliff:g xmlns:xliff=\"urn:oasis:names:tc:xliff:document:1.2\" id=\"DATE\"&gt;%1$s&lt;/xliff:g&gt;</string>
<string name="agenda_yesterday" msgid="4170964206728599693">Ahir, &lt;xliff:g xmlns:xliff=\"urn:oasis:names:tc:xliff:document:1.2\" id=\"DATE\"&gt;%1$s&lt;/xliff:g&gt;</string>
<string name="agenda_tomorrow" msgid="3893625470780723605">Demà, &lt;xliff:g xmlns:xliff=\"urn:oasis:names:tc:xliff:document:1.2\" id=\"DATE\"&gt;%1$s&lt;/xliff:g&gt;</string>
<string name="loading" msgid="3772533493214331230">"S\'està carregant…"</string>
<string name="show_older_events" msgid="5140647493681439926">"Toca per mostrar esdeveniments anteriors a <xliff:g id="OLDEST_SEARCH_RANGE">%1$s</xliff:g>"</string>
<string name="show_newer_events" msgid="2604638815440163080">"Toca per mostrar esdeveniments posteriors a <xliff:g id="NEWEST_SEARCH_RANGE">%1$s</xliff:g>"</string>
Expand Down Expand Up @@ -255,7 +256,7 @@
<string name="preferences_default_event_duration_title">Duració d\'esdeveniment per defecte</string>
<string name="preferences_issues">Reporta problema</string>
<string name="user_rejected_calendar_write_permission">Etar requereix permisos per a llegir i escriure al calendari per a funcionar correctament. Si us plau, prova-ho de nou.</string>
<string name="calendar_permission_not_granted">Ho sentim, aquesta característica no pot funcionar. Etar requereix permisos per a llegir i escriure al calendari per a funcionar correctament</string>
<string name="calendar_permission_not_granted">S\'han denegat els permisos necessaris, activeu-los des de la configuració per a editar esdeveniments</string>
<string name="visibility_confidential">Confidencial</string>
<string name="zero_minutes">0 minuts</string>
<string name="fifteen_minutes">15 minuts</string>
Expand All @@ -270,7 +271,7 @@
<string name="error_generating_ics">S\'han trobat problemes mentre es compartia l\'esdeveniment</string>
<string name="cal_share_intent_title">Envia l\'esdeveniment a:</string>
<string name="cal_export_event_sdcard_title">Exporta a la targeta SD</string>
<string name="cal_export_succ_msg">Esdeveniment exportat satisfactòriament: %1s</string>
<string name="cal_export_succ_msg">Esdeveniment exportat satisfactòriament: %1$s</string>
<string name="cal_import_menu_title">Importar l\'esdeveniment</string>
<string name="cal_nothing_to_import">No hi ha res per a importar</string>
<string name="cal_import_error_msg">L\'importació a calendari ha fallat</string>
Expand All @@ -288,7 +289,7 @@
<string name="show_time_start_end_below">Hora d\'inici i de finalització sota l\'esdeveniment</string>
<string name="maximum_number_of_lines">Número màxim de línies a l\'esdeveniment</string>
<string name="foreground_notification_channel_name">Sincronització d\'alertes</string>
<string name="foreground_notification_channel_description">És necessari una notificació principal per sincronitzar el servei intern d\'alertes; silencieu-la</string>
<string name="foreground_notification_channel_description">És necessari una notificació principal per sincronitzar el servei intern d\'alertes.</string>
<string name="preferences_list_add_offline_message">Els calendaris fora de línia NO es sincronitzen al núvol i només són disponibles al teu telèfon.</string>
<string name="preferences_calendar_color_warning_message">El canvi de color podria ser revertit quan el calendari es torni a sincronitzar.
\n
Expand Down Expand Up @@ -316,7 +317,7 @@
<string name="preferences_calendar_info_category">Informació del calendari</string>
<string name="preferences_calendar_display_name">Canvia el nom</string>
<string name="preferences_calendar_delete">Esborra el calendari</string>
<string name="preferences_calendar_number_of_events">%1d esdeveniments</string>
<string name="preferences_calendar_number_of_events">%1$d esdeveniments</string>
<string name="preferences_calendar_configure_account">Configura el calendari a %1$s</string>
<string name="preferences_calendar_account_local">Calendari fora de línia</string>
<string name="preferences_calendar_account">Compte %1$s</string>
Expand All @@ -326,4 +327,14 @@
<string name="changelog">Registre de canvis</string>
<string name="authors">Autors</string>
<string name="app_copyright">© 2015-<xliff:g>%1$s</xliff:g> The Etar Project. Porcions © 2005-<xliff:g>%1$s</xliff:g> The Android Open Source Project.</string>
</resources>
<string name="preferences_list_add_remote_etesync">Afegeix un calendari EteSync</string>
<string name="seven_days">7 dies</string>
<string name="six_days">6 dies</string>
<string name="five_days">5 dies</string>
<string name="four_days">4 dies</string>
<string name="three_days">3 dies</string>
<string name="two_days">2 dies</string>
<string name="preferences_pure_black_night_mode">Mode negra nit pura</string>
<string name="preferences_system_theme">Sistema</string>
<string name="preferences_list_add_remote">Afegeix un calendari CalDAV</string>
</resources>
5 changes: 4 additions & 1 deletion res/values-de/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -334,4 +334,7 @@
<string name="three_days">3 Tage</string>
<string name="two_days">2 Tage</string>
<string name="preferences_system_theme">Systemstandard</string>
</resources>
<string name="preferences_list_add_remote_etesync">EteSync-Kalender hinzufügen</string>
<string name="preferences_list_add_remote">CalDAV-Kalender hinzufügen</string>
<string name="preferences_pure_black_night_mode">Rein schwarzer Nachtmodus</string>
</resources>
2 changes: 1 addition & 1 deletion res/values-en-rGB/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@
<string name="preferences_month_view_landscape">Month view layout (Landscape)</string>
<string name="preferences_month_view_portrait">Month view layout (Portrait)</string>
<string name="no_map">There is no maps app installed</string>
<string name="foreground_notification_channel_description">Foreground notification required for internal alert sync. Please mute</string>
<string name="foreground_notification_channel_description">Foreground notification required for internal alert sync.</string>
<string name="foreground_notification_channel_name">Alert sync</string>
<string name="rsvp_declined">Responded no.</string>
<string name="rsvp_tentative">Responded maybe.</string>
Expand Down
5 changes: 4 additions & 1 deletion res/values-es/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -334,4 +334,7 @@
<string name="three_days">3 días</string>
<string name="two_days">2 días</string>
<string name="preferences_system_theme">Sistema por defecto</string>
</resources>
<string name="preferences_list_add_remote_etesync">Añadir calendario EteSync</string>
<string name="preferences_list_add_remote">Añadir calendario CalDAV</string>
<string name="preferences_pure_black_night_mode">Modo noche negro puro</string>
</resources>
35 changes: 21 additions & 14 deletions res/values-eu/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,9 @@
<string name="quick_response_custom_msg">Idatzi zurea…</string>
<string name="event_info_organizer">Antolatzailea:</string>
<string name="event_info_reminders_label">Oharrak</string>
<string name="agenda_today">gaur, <xliff:g id="date">%1$s</xliff:g>
</string>
<string name="agenda_yesterday">atzo, <xliff:g id="date">%1$s</xliff:g>
</string>
<string name="agenda_tomorrow">bihar, <xliff:g id="date">%1$s</xliff:g>
</string>
<string name="agenda_today">Gaur, &lt;xliff:g xmlns:xliff=\"urn:oasis:names:tc:xliff:document:1.2\" id=\"date\"&gt;%1$s&lt;/xliff:g&gt;</string>
<string name="agenda_yesterday">Atzo, &lt;xliff:g xmlns:xliff=\"urn:oasis:names:tc:xliff:document:1.2\" id=\"date\"&gt;%1$s&lt;/xliff:g&gt;</string>
<string name="agenda_tomorrow">Bihar, &lt;xliff:g xmlns:xliff=\"urn:oasis:names:tc:xliff:document:1.2\" id=\"date\"&gt;%1$s&lt;/xliff:g&gt;</string>
<string name="loading">Kargatzen…</string>
<string name="show_older_events">
<xliff:g id="oldest_search_range">%1$s</xliff:g>
Expand Down Expand Up @@ -122,7 +119,7 @@
<string name="preferences_light_theme">Argia</string>
<string name="preferences_dark_theme">Iluna</string>
<string name="preferences_black_theme">Beltza</string>
<string name="preferences_color">Kolore Nagusia</string>
<string name="preferences_color">Kolore nagusia</string>
<string name="preferences_color_pick">Kolore Nagusia</string>
<string name="preferences_reminder_title">Jakinarazpenak eta abisuak</string>
<string name="preferences_hide_declined_title">Ezkutatu baztertutako gertaerak</string>
Expand Down Expand Up @@ -187,7 +184,7 @@
</plurals>
<string name="acessibility_recurrence_choose_end_date_description">aldatu bukera data</string>
<string name="user_rejected_calendar_write_permission">Etar-ek egutegiaren irakurketa eta idazketa baimenak behar ditu ondo funtzionatzeko. Saiatu berri mesedez.</string>
<string name="calendar_permission_not_granted">Barkatu, aukera hau ez dabil. Etar-ek egutegiaren irakurketa eta idazketa baimenak behar ditu ondo funtzionatzeko</string>
<string name="calendar_permission_not_granted">Eskatutako baimenak ukatu egin dira. Gaitu itzazu ezarpenak aplikaziotik gertaerak editatzeko</string>
<string name="visibility_default">Lehenetsia</string>
<string name="visibility_confidential">Isilpekoa</string>
<string name="visibility_private">Pribatua</string>
Expand All @@ -201,7 +198,7 @@
<string name="error_generating_ics">Arazoak gertatu dira gertaera partekatzerakoan</string>
<string name="cal_share_intent_title">Bidali gertaera honi:</string>
<string name="cal_export_event_sdcard_title">Esportatu SD txartelara</string>
<string name="cal_export_succ_msg">Gertaera behar bezala esportatu da: %1s</string>
<string name="cal_export_succ_msg">Gertaera behar bezala esportatu da: %1$s</string>
<string name="cal_import_menu_title">Inportatu gertaera</string>
<string name="cal_nothing_to_import">Ezer ez inportatzeko</string>
<string name="cal_import_error_msg">Errorea egutegia inportatzean</string>
Expand Down Expand Up @@ -229,8 +226,8 @@
<item quantity="other"><xliff:g id="count">%d</xliff:g> egun</item>
</plurals>
<plurals name="weekN">
<item quantity="one"><xliff:g id="count">%d</xliff:g>. astea</item>
<item quantity="other"/>
<item quantity="one">&lt;xliff:g xmlns:xliff=\"urn:oasis:names:tc:xliff:document:1.2\" id=\"count\"&gt;%d&lt;/xliff:g&gt;. astea</item>
<item quantity="other">&lt;xliff:g xmlns:xliff=\"urn:oasis:names:tc:xliff:document:1.2\" id=\"count\"&gt;%d&lt;/xliff:g&gt;. astea</item>
</plurals>
<string name="no_calendars_found">Gertaera bat gehitu aurretik, gutxienez Egutegi bat gehitu behar duzu zure gailuan eta egutegia ikusgarri bezala markatu. Ukitu Gehitu Kontua kontu bat gehitzeko (kontu bat gehitu baduzu, itxaron sinkronizazioa bukatu arte eta saiatu berriz). Edo ukitu Utzi eta ziurtatu gutxienez egutegi bat dagoela ikusgarri.</string>
<string name="show_newer_events">Ukitu gertaerak ikusteko <xliff:g id="newest_search_range">%1$s</xliff:g> baino geroago</string>
Expand Down Expand Up @@ -283,7 +280,7 @@
<string name="show_time_start_end_below">Hasiera eta bukaera denbora gertaera azpian</string>
<string name="maximum_number_of_lines">Gertaeraren gehieneko lerro kopurua</string>
<string name="foreground_notification_channel_name">Alerta-sinkronizazioa</string>
<string name="foreground_notification_channel_description">Lehen planoko jakinarazpena beharrezkoa da barne alertak sinkronizatzeko. Mesedez, isildu</string>
<string name="foreground_notification_channel_description">Lehen planoko jakinarazpena beharrezkoa da barne alertak sinkronizatzeko.</string>
<string name="cal_import_error_time_zone_msg">Ezin da emandako denbora-zona ulertu: %s</string>
<string name="preferences_calendar_account">%1$s kontua</string>
<string name="preferences_calendar_delete">Ezabatu egutegia</string>
Expand Down Expand Up @@ -319,6 +316,16 @@
<string name="preferences_calendar_no_display_name">Izen gabeko egutegia</string>
<string name="preferences_calendar_account_local">Lineaz kanpoko egutegia</string>
<string name="preferences_calendar_configure_account">Konfiguratu %1$s egutegia</string>
<string name="preferences_calendar_number_of_events">%1d gertaera</string>
<string name="preferences_calendar_number_of_events">%1$d gertaera</string>
<string name="preferences_calendar_info_category">Egutegiaren informazioa</string>
</resources>
<string name="preferences_list_add_remote_etesync">Gehitu EteSync egutegia</string>
<string name="preferences_list_add_remote">Gehitu CalDAV egutegia</string>
<string name="seven_days">7 egun</string>
<string name="six_days">6 egun</string>
<string name="five_days">5 egun</string>
<string name="four_days">4 egun</string>
<string name="three_days">3 egun</string>
<string name="two_days">2 egun</string>
<string name="preferences_pure_black_night_mode">Gau beltzeko modua</string>
<string name="preferences_system_theme">Sistemaren lehenetsia</string>
</resources>
Loading

0 comments on commit ded9895

Please sign in to comment.