David A. Velasco
053aad5ae1
Merge branch 'bug_hunting' into feature_previews
...
Conflicts:
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
2013-04-04 16:49:04 +02:00
David A. Velasco
77ddd1ccb6
Merge branch 'develop' into feature_previews
...
Conflicts:
AndroidManifest.xml
res/menu/file_context_menu.xml
res/menu/menu.xml
res/values-de-rDE/strings.xml
res/values/strings.xml
src/com/owncloud/android/files/services/FileUploader.java
src/com/owncloud/android/operations/UploadFileOperation.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
2013-04-04 16:44:30 +02:00
David A. Velasco
97ae9007e4
Fixed hardcoded string in UploaderActivity layout; and German translations
2013-03-27 17:19:19 +01:00
David A. Velasco
237a326598
Added German translation for media and preview text strings
2013-03-21 13:52:56 +01:00
David A. Velasco
fc134b1928
Updated translation files
2013-03-11 13:54:23 +01:00
Matthias Baumann
f764980474
- extend existing FileUpload, so we can handel failed instand upload
...
later
- new Activity to handle failed instant uploads
- new Activity InstantUploadActivity can be started at two ways,
-touch to the 'Faild Upload Notifivation'
-submenue underneath the upload menue
- merges from head
- add lazy loading for the images list with failed uploads
2013-02-25 08:21:33 +01:00
David A. Velasco
75c84c7b06
German translation updated
2013-01-11 12:45:10 +01:00
David A. Velasco
7239b9eb9d
Translations update
2013-01-10 18:38:41 +01:00
David A. Velasco
a2f48dc563
New German update
2012-11-29 16:52:29 +01:00
David A. Velasco
5dec5264b2
Updated some languages (remaining coming soon)
2012-11-29 16:01:53 +01:00
Bartek Przybylski
4a737cb71c
updated translations
2012-10-22 21:18:20 +02:00
