Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
@greenart7c3
greenart7c3 committed Aug 23, 2024
2 parents e5c5658 + 1b48e32 commit c11fe93
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 26 deletions.
14 changes: 7 additions & 7 deletions app/src/main/res/values-de/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@
<string name="import_failed">Import fehlgeschlagen</string>
<string name="invalid_file_extension">Datei nicht unterstützt</string>
<string name="imported_events_successfully">%1$d Events erfolgreich importiert</string>
<string name="never">Never</string>
<string name="day">One Day</string>
<string name="one_week">One Week</string>
<string name="one_month">One Month</string>
<string name="one_year">One Year</string>
<string name="delete_events_older_than">Delete events</string>
<string name="delete_events_older_than_description">Delete events older than</string>
<string name="never">Nie</string>
<string name="day">Ein Tag</string>
<string name="one_week">Eine Woche</string>
<string name="one_month">Ein Monat</string>
<string name="one_year">Ein Jahr</string>
<string name="delete_events_older_than">Events löschen</string>
<string name="delete_events_older_than_description">Lösche Events älter als</string>
<string name="import_events">Events importieren</string>
<string name="import_events_warning">Vorhandene Events löschen? Diese Aktion kann nicht rückgängig gemacht werden.</string>
<string name="yes">Ja</string>
Expand Down
24 changes: 12 additions & 12 deletions app/src/main/res/values-fr/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@
<string name="import_failed">Échec de l\'importation</string>
<string name="invalid_file_extension">Fichier non pris en charge</string>
<string name="imported_events_successfully">Import avec succès de %1$d événements</string>
<string name="never">Never</string>
<string name="day">One Day</string>
<string name="one_week">One Week</string>
<string name="one_month">One Month</string>
<string name="one_year">One Year</string>
<string name="delete_events_older_than">Delete events</string>
<string name="delete_events_older_than_description">Delete events older than</string>
<string name="import_events">Import events</string>
<string name="import_events_warning">Delete existing events? This action cannot be undone.</string>
<string name="yes">Yes</string>
<string name="no">No</string>
<string name="cancel">Cancel</string>
<string name="never">Jamais</string>
<string name="day">Une journée</string>
<string name="one_week">Une semaine</string>
<string name="one_month">Un mois</string>
<string name="one_year">Un an</string>
<string name="delete_events_older_than">Supprimer les événements</string>
<string name="delete_events_older_than_description">Supprimer les événements antérieurs à</string>
<string name="import_events">Importer des événements</string>
<string name="import_events_warning">Supprimer les événements existants ? Cette action ne peut être annulée.</string>
<string name="yes">Oui</string>
<string name="no">Non</string>
<string name="cancel">Annuler</string>
</resources>
14 changes: 7 additions & 7 deletions app/src/main/res/values-zh-rCN/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@
<string name="import_failed">导入失败</string>
<string name="invalid_file_extension">不支持的文件类型</string>
<string name="imported_events_successfully">成功导入 %1$d 个事件</string>
<string name="never">Never</string>
<string name="day">One Day</string>
<string name="one_week">One Week</string>
<string name="one_month">One Month</string>
<string name="one_year">One Year</string>
<string name="delete_events_older_than">Delete events</string>
<string name="delete_events_older_than_description">Delete events older than</string>
<string name="never">从不</string>
<string name="day">一天</string>
<string name="one_week">一周</string>
<string name="one_month">一个月</string>
<string name="one_year">一年</string>
<string name="delete_events_older_than">删除事件</string>
<string name="delete_events_older_than_description">删除早于该时间的事件</string>
<string name="import_events">导入事件</string>
<string name="import_events_warning">删除已有事件？该操作无法撤销。</string>
<string name="yes">确定</string>
Expand Down

0 comments on commit c11fe93

Please sign in to comment.