Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 087b0f90 authored by Marten Gajda's avatar Marten Gajda
Browse files

Merge branch 'new_list_style' of 

ssh://gitosis@git.dmfs.org:23023/android-tasks/tasks.git into
new_list_style

Conflicts:
	res/values-de/strings.xml
	res/values/strings.xml
parents 91670b76 c4e3c408

AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<manifest xmlns:android="http://schemas.android.com/apk/res/android"

    package="org.dmfs.tasks"

    android:versionCode="48"

    android:versionName="1.0.12" >

    android:versionCode="66"

    android:versionName="1.1-pre6" >



    <uses-sdk

        android:minSdkVersion="8"

res/values-de/strings.xml

+8 −9
Original line number Diff line number Diff line
@@ -75,7 +75,6 @@ 
    <string name="task_group_due_in_month">Fällig im %s</string>

    <string name="task_group_due_in_year">Fällig %s</string>

    <string name="task_group_due_in_future">Irgendwann</string>

    <string name="today">Heute</string>



    <!-- Task list start group titles -->

    <string name="task_group_start_started">Schon gestartet</string>

res/values-es/strings.xml

+0 −1
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ 
    <string name="task_group_due_in_month">Vence en %s</string>

    <string name="task_group_due_in_year">Vence en %s</string>

    <string name="task_group_due_in_future">Vence más tarde</string>

    <string name="today">Hoy</string>



    <!-- Task editor labels -->

res/values-fr/strings.xml

+0 −1
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ 
    <string name="task_group_due_in_month">Due dans %s</string>

    <string name="task_group_due_in_year">Due dans %s</string>

    <string name="task_group_due_in_future">Due plus tard</string>

    <string name="today">Aujourd\'hui</string>



    <!-- Task editor labels -->

res/values-it/strings.xml

+0 −1
Original line number Diff line number Diff line
@@ -68,7 +68,6 @@ 
    <string name="task_group_due_in_month">Scadono in %s</string>

    <string name="task_group_due_in_year">Scadono nel %s</string>

    <string name="task_group_due_in_future">Scadono successivamente</string>

    <string name="today">Oggi</string>



    <!-- Task editor labels -->