Skip to content

Commit

Permalink
Merge branch 'hotfix/5.5.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
Federico Iosue committed May 11, 2018
2 parents 5cc16b3 + 82a80f0 commit 2e53446
Show file tree
Hide file tree
Showing 13 changed files with 19 additions and 43 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.1'
classpath 'com.android.tools.build:gradle:3.1.2'
classpath 'me.tatarka:gradle-retrolambda:3.2.5'
classpath 'me.tatarka.retrolambda.projectlombok:lombok.ast:0.2.3.a2'
classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.6"
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#

VERSION_NAME=5.5.0
VERSION_CODE=245
VERSION_NAME=5.5.1
VERSION_CODE=246
PACKAGE=it.feio.android.omninotes

MIN_SDK=16
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
29 changes: 0 additions & 29 deletions omniNotes/src/main/res/drawable/ic_access_time_black_24px.xml

This file was deleted.

4 changes: 2 additions & 2 deletions omniNotes/src/main/res/layout/attachment_dialog.xml
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/icon_selector"
android:drawableLeft="@drawable/ic_access_time_black_24px"
android:drawableStart="@drawable/ic_access_time_black_24px"
android:drawableLeft="@drawable/ic_clock_outline_black_24dp"
android:drawableStart="@drawable/ic_clock_outline_black_24dp"
android:drawablePadding="@dimen/attachment_dialog_drawable_padding"
android:padding="@dimen/attachment_dialog_items_padding"
android:paddingStart="@dimen/horizontal_margin"
Expand Down
5 changes: 5 additions & 0 deletions omniNotes/src/main/res/raw/changelog.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@
-->
<changelog bulletedList="true">

<changelogversion versionName="5.5.1" changeDate="May 11, 2018">
<changelogtext>[i]Improved![/i] Updated translations</changelogtext>
<changelogtext>[u]Fix[/u] Attachments' dialog opening on Kitkat</changelogtext>
</changelogversion>

<changelogversion versionName="5.5.0" changeDate="Apr 26, 2018">
<changelogtext>[b]New![/b] Rapidly search your unfinished to-do lists</changelogtext>
<changelogtext>[b]New![/b] New "attachment" available to easily add the current timestamp</changelogtext>
Expand Down
2 changes: 1 addition & 1 deletion omniNotes/src/main/res/values-de-rDE/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
<string name="delete_category_confirmation">Diese Kategorie wird von einer oder mehreren Notiz(en) verwendet.\nKategoriezugehörigkeit der Notiz(en) entfernen und löschen der Kategorie bestätigen?</string>
<string name="discard">Verwerfen</string>
<string name="remove_category">Kategorie entfernen</string>
<string name="no_tags_created">Keine Tags vorhanden\nErstelle sie, indem du Hashtags verwendest</string>
<string name="no_tags_created">Keine Tags vorhanden\nErstelle sie, indem du Hashtags in deinen Notizen verwendest</string>
<string name="no_categories_created">Es wurden bisher noch keine Kategorien erstellt</string>
<string name="notes_category_removed">Kategorie von den Notizen entfernt</string>
<string name="notes_categorized_as">Notizen kategorisiert als</string>
Expand Down
2 changes: 1 addition & 1 deletion omniNotes/src/main/res/values-fr-rFR/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@
<string name="tour_detailactivity_reminder_title">Appuyez juste</string>
<string name="tour_detailactivity_reminder_detail">Des appuis courts ou longs sur un élément (pièce jointe, localisation, rappel) ont des effets différents !</string>
<string name="tour_detailactivity_links_title">Liens</string>
<string name="tour_detailactivity_links_detail">URL, adresses courriel et reconnaissance de numéros de téléphone</string>
<string name="tour_detailactivity_links_detail">Adresses internet, courriel et reconnaissance de numéros de téléphone</string>
<string name="tour_detailactivity_swipe_title">Glisser</string>
<string name="tour_detailactivity_swipe_detail">Créer de nouvelles notes sans \nquitter celle que vous modifiez</string>
<string name="tour_detailactivity_save_title">Enregistrer</string>
Expand Down
14 changes: 7 additions & 7 deletions omniNotes/src/main/res/values-nl-rNL/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -193,16 +193,16 @@
<string name="filter_archived">Gearchiveerde notities verbergen</string>
<string name="remove_filter_archived">Gearchiveerde notities weergeven</string>
<string name="permission_external_storage">Een machtiging om te schrijven naar externe opslag is nodig voor back-ups in openbare mappen</string>
<string name="permission_external_storage_detail_attachment">Permission to read on external storage is needed to allow attaching files from there</string>
<string name="permission_external_storage_detail_attachment">Een machtiging is nodig om vanuit externe opslag bestanden te kunnen toevoegen als bijlage</string>
<string name="permission_audio_recording">Toestemming voor het gebruik van de microfoon is nodig om audionotities te kunnen opnemen</string>
<string name="permission_coarse_location">Toestemming voor locatietoegang is nodig om de locatie aan uw notities te kunnen toevoegen</string>
<string name="permission_not_granted">Toestemming niet verleend</string>
<string name="checklist">Checklist</string>
<string name="text_note">Tekstnotitie</string>
<string name="photo">Foto</string>
<string name="uncompleted_checklists">Incompleted checklists</string>
<string name="uncompleted_checklists">Nog niet voltooide checklist</string>
<string name="info">Info</string>
<string name="completed">Completed</string>
<string name="completed">Voltooid</string>
<!-- Settings -->
<string name="dashclock_description">Sommige statistieken en de naderende herinneringen van Omni notities worden weergegeven</string>
<string name="settings">Instellingen</string>
Expand Down Expand Up @@ -248,7 +248,7 @@
<string name="insert_new_password">Geef een nieuw wachtwoord in</string>
<string name="confirm_new_password">Bevestig het nieuwe wachtwoord</string>
<string name="password_successfully_changed">Wachtwoord succesvol gewijzigd</string>
<string name="password_successfully_removed">Password removed: all notes have been unlocked</string>
<string name="password_successfully_removed">Wachtwoord verwijderd: alle notities zijn ontgrendeld</string>
<string name="wrong_password">Verkeerd paswoord</string>
<string name="empty_password">Het wachtwoord is leeg</string>
<string name="agree_unlocking_all_notes">Verwijder wachtwoord\nen ontgrendel alle vergrendelde notities?</string>
Expand Down Expand Up @@ -362,17 +362,17 @@
<string name="tour_listactivity_actions_title">acties</string>
<string name="tour_listactivity_actions_detail">Nieuwe notities maken, ze sorteren, toegang tot Voorkeuren</string>
<string name="tour_listactivity_home_title">Navigatie</string>
<string name="tour_listactivity_home_detail">Navigation menu allows you to move through notes with filters and categories</string>
<string name="tour_listactivity_home_detail">Met het navigatie-menu kunt u door notities navigeren via filters en categoriën</string>
<string name="tour_listactivity_tag_title">Tags</string>
<string name="tour_listactivity_tag_detail">Add colored categories to organize notes at-a-glance</string>
<string name="tour_listactivity_tag_detail">Gekleurde categorie toevoegen om notities snel en visueel te organiseren</string>
<string name="tour_detailactivity_attachment_title">Verbeteren</string>
<string name="tour_detailactivity_attachment_detail">Een heleboel verschillende bijlagentypen aan uw notities toevoegen!</string>
<string name="tour_detailactivity_action_title">Meer doen</string>
<string name="tour_detailactivity_action_detail">Delen, labelen, archiveren en beschermen, en...</string>
<string name="tour_detailactivity_reminder_title">Druk gewoon op</string>
<string name="tour_detailactivity_reminder_detail">Korte of lange drukken op objecten (bijlagen, locatie, herinnering) hebben verschillende effecten!</string>
<string name="tour_detailactivity_links_title">Links</string>
<string name="tour_detailactivity_links_detail">URL, e-mail addresses and telephone numbers recognition</string>
<string name="tour_detailactivity_links_detail">URL, e-mail adressen en telefoonnummer-herkenning</string>
<string name="tour_detailactivity_swipe_title">Veeg</string>
<string name="tour_detailactivity_swipe_detail">Nieuwe notities maken zonder\ndegene die u aan het bewerken\n bent te verlaten</string>
<string name="tour_detailactivity_save_title">Opslaan</string>
Expand Down

0 comments on commit 2e53446

Please sign in to comment.