fix lint issues

src/main/java/com/ortiz/touch/TouchImageView.java

@@ -12,6 +12,7 @@
 
 package com.ortiz.touch;
 
+import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.res.Configuration;
@@ -38,6 +39,7 @@ import android.widget.ImageView;
 import android.widget.OverScroller;
 import android.widget.Scroller;
 
+@SuppressLint("AppCompatCustomView")
 public class TouchImageView extends ImageView {
 	
 	private static final String DEBUG = "DEBUG";
@@ -94,9 +96,9 @@ public class TouchImageView extends ImageView {
     
     private ScaleGestureDetector mScaleDetector;
     private GestureDetector mGestureDetector;
-    private GestureDetector.OnDoubleTapListener doubleTapListener = null;
+    private GestureDetector.OnDoubleTapListener doubleTapListener = null;
     private OnTouchListener userTouchListener = null;
-    private OnTouchImageViewListener touchImageViewListener = null;
+    private OnTouchImageViewListener touchImageViewListener = null;
 
     public TouchImageView(Context context) {
         super(context);
@@ -133,22 +135,22 @@ public class TouchImageView extends ImageView {
         setScaleType(ScaleType.MATRIX);
         setState(State.NONE);
         onDrawReady = false;
-        super.setOnTouchListener(new PrivateOnTouchListener());
+        super.setOnTouchListener(new PrivateOnTouchListener());
     }
-
-    @Override
-    public void setOnTouchListener(View.OnTouchListener l) {
-        userTouchListener = l;
+
+    @Override
+    public void setOnTouchListener(View.OnTouchListener l) {
+        userTouchListener = l;
     }
     
     public void setOnTouchImageViewListener(OnTouchImageViewListener l) {
     	touchImageViewListener = l;
-    }
-
-    public void setOnDoubleTapListener(GestureDetector.OnDoubleTapListener l) {
-        doubleTapListener = l;
-    }
-
+    }
+
+    public void setOnDoubleTapListener(GestureDetector.OnDoubleTapListener l) {
+        doubleTapListener = l;
+    }
+
     @Override
     public void setImageResource(int resId) {
     	super.setImageResource(resId);
@@ -401,7 +403,7 @@ public class TouchImageView extends ImageView {
     /**
      * Set zoom parameters equal to another TouchImageView. Including scale, position,
      * and ScaleType.
-     * @param TouchImageView
+     * @param img
      */
     public void setZoom(TouchImageView img) {
     	PointF center = img.getScrollPosition();
@@ -755,7 +757,7 @@ public class TouchImageView extends ImageView {
         {
             if(doubleTapListener != null) {
             	return doubleTapListener.onSingleTapConfirmed(e);
-            }
+            }
         	return performClick();
         }
         
@@ -785,7 +787,7 @@ public class TouchImageView extends ImageView {
         	boolean consumed = false;
             if(doubleTapListener != null) {
             	consumed = doubleTapListener.onDoubleTap(e);
-            }
+            }
         	if (state == State.NONE) {
 	        	float targetZoom = (normalizedScale == minScale) ? maxScale : minScale;
 	        	DoubleTapZoom doubleTap = new DoubleTapZoom(targetZoom, e.getX(), e.getY(), false);
@@ -794,14 +796,14 @@ public class TouchImageView extends ImageView {
         	}
         	return consumed;
         }
-
-        @Override
-        public boolean onDoubleTapEvent(MotionEvent e) {
+
+        @Override
+        public boolean onDoubleTapEvent(MotionEvent e) {
             if(doubleTapListener != null) {
             	return doubleTapListener.onDoubleTapEvent(e);
-            }
-            return false;
-        }
+            }
+            return false;
+        }
     }
     
     public interface OnTouchImageViewListener {

src/main/res/values-ar/strings.xml

@@ -232,7 +232,6 @@
 
     <string name="placeholder_sentence">هذه مساحة محجوزة</string>
     <string name="placeholder_filename">placeholder.txt</string>
-    <string name="placeholder_filetype">صورة PNG</string>
     <string name="placeholder_filesize">389 KB</string>
     <string name="placeholder_timestamp">2012/05/18 12:23 مساء</string>
     <string name="placeholder_media_time">12:23:45</string>
@@ -283,7 +282,6 @@
 
     <string name="forbidden_permissions_copy">لنسخ هذا الملف</string>
 
-    <string name="prefs_category_instant_uploading">تحميلات تلقائية</string>
     <string name="prefs_category_details">تفاصيل</string>
 
 	<string name="shared_subject_header">المشاركات</string>

src/main/res/values-ast/strings.xml

@@ -250,7 +250,6 @@
 
     <string name="placeholder_sentence">Esto ye un marcador de posición</string>
     <string name="placeholder_filename">MarcadorDePosicion.txt</string>
-    <string name="placeholder_filetype">Imaxe PNG</string>
     <string name="placeholder_filesize">389 KB</string>
     <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
     <string name="placeholder_media_time">12:23:45</string>
@@ -349,10 +348,8 @@
     <string name="copy_file_error">Asocedió un fallú entrín s\'intentaba copiar esta carpeta o ficheru</string>
     <string name="forbidden_permissions_copy">pa copiar esti ficheru</string>
 
-    <string name="prefs_category_instant_uploading">Xubes nel intre</string>
     <string name="prefs_category_details">Detalles</string>
 
-	<string name="prefs_instant_video_upload_path_title">Carpeta Vídeo pa xubes nel intre</string>
     <string name="sync_folder_failed_content">La sincronización de la carpeta %1$s nun pudo completase</string>
 
 	<string name="shared_subject_header">compartíu</string>

src/main/res/values-bg-rBG/strings.xml

@@ -288,7 +288,6 @@
     <string name="copy_file_error">Възникна грешка при опита за копиране на файла или папката</string>
     <string name="forbidden_permissions_copy">да копира този файл</string>
 
-    <string name="prefs_category_instant_uploading">Незабавни качвания</string>
     <string name="prefs_category_details">Детайли</string>
 
 	<string name="sync_folder_failed_content">Синхронизацията на папка %1$s не може да бъде завършена</string>

src/main/res/values-ca/strings.xml

@@ -292,7 +292,6 @@
 
     <string name="placeholder_sentence">Això és un text variable</string>
     <string name="placeholder_filename">placeholder.txt</string>
-    <string name="placeholder_filetype">Imatge PNG</string>
     <string name="placeholder_filesize">389 KB</string>
     <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
     <string name="placeholder_media_time">12:23:45</string>
@@ -371,7 +370,6 @@
     <string name="copy_file_error">Hi ha hagut un error en copiar aquest fitxer o carpeta</string>
     <string name="forbidden_permissions_copy">per copiar aquest fitxer</string>
 
-    <string name="prefs_category_instant_uploading">Pujada instantània</string>
     <string name="prefs_category_details">Detalls</string>
 
 	<string name="sync_folder_failed_content">La sincronització de la carpeta %1$s no s\'ha pogut completar</string>

src/main/res/values-cs-rCZ/strings.xml

@@ -320,7 +320,6 @@
 
     <string name="placeholder_sentence">Zástupný text</string>
     <string name="placeholder_filename">placeholder.txt</string>
-    <string name="placeholder_filetype">Obrázek PNG</string>
     <string name="placeholder_filesize">389 KB</string>
     <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
     <string name="placeholder_media_time">12:23:45</string>
@@ -438,10 +437,8 @@
     <string name="copy_file_error">Při pokusu o zkopírování tohoto souboru či adresáře došlo k chybě</string>
     <string name="forbidden_permissions_copy">pro zkopírování tohoto souboru</string>
 
-    <string name="prefs_category_instant_uploading">Okamžitá odesílání</string>
     <string name="prefs_category_details">Podrobnosti</string>
 
-	<string name="prefs_instant_video_upload_path_title">Adresář pro okamžité nahrání videa</string>
     <string name="sync_folder_failed_content">Synchronizaci adresáře %1$s nelze dokončit</string>
 
 	<string name="shared_subject_header">sdílené</string>

src/main/res/values-da/strings.xml

@@ -247,7 +247,6 @@
 
     <string name="placeholder_sentence">Dette er en pladsholder</string>
     <string name="placeholder_filename">pladsholder.txt</string>
-    <string name="placeholder_filetype">PNG billede</string>
     <string name="placeholder_filesize">389 KB</string>
     <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
     <string name="placeholder_media_time">12:23:45</string>

src/main/res/values-de-rDE/strings.xml

@@ -322,7 +322,6 @@
 
     <string name="placeholder_sentence">Dies ist ein Platzhalter</string>
     <string name="placeholder_filename">platzhalter.txt</string>
-    <string name="placeholder_filetype">PNG-Bild</string>
     <string name="placeholder_filesize">389 KB</string>
     <string name="placeholder_timestamp">18.5.2012 12:23</string>
     <string name="placeholder_media_time">12:23:45</string>
@@ -440,10 +439,8 @@
     <string name="copy_file_error">Es ist ein Fehler beim Kopieren der Datei oder des Ordners aufgetreten.</string>
     <string name="forbidden_permissions_copy">diese Datei zu kopieren</string>
 
-    <string name="prefs_category_instant_uploading">sofort hochladen</string>
     <string name="prefs_category_details">Details</string>
 
-	<string name="prefs_instant_video_upload_path_title">Video Speicherpfad wählen</string>
     <string name="sync_folder_failed_content">Bei der Synchronisation konnte %1$s Ordner nicht fertig gestellt werden</string>
 
 	<string name="shared_subject_header">geteilt</string>

src/main/res/values-de/strings.xml

@@ -322,7 +322,6 @@
 
     <string name="placeholder_sentence">Dies ist ein Platzhalter</string>
     <string name="placeholder_filename">platzhalter.txt</string>
-    <string name="placeholder_filetype">PNG-Bild</string>
     <string name="placeholder_filesize">389 KB</string>
     <string name="placeholder_timestamp">18.5.2012 12:23</string>
     <string name="placeholder_media_time">12:23:45</string>
@@ -440,10 +439,8 @@
     <string name="copy_file_error">Es ist ein Fehler beim Kopieren der Datei oder des Ordners aufgetreten.</string>
     <string name="forbidden_permissions_copy">diese Datei zu kopieren</string>
 
-    <string name="prefs_category_instant_uploading">sofort hochladen</string>
     <string name="prefs_category_details">Details</string>
 
-	<string name="prefs_instant_video_upload_path_title">Video Speicherpfad wählen</string>
     <string name="sync_folder_failed_content">Bei der Synchronisation konnte %1$s Ordner nicht fertig gestellt werden</string>
 
 	<string name="shared_subject_header">geteilt</string>

src/main/res/values-el/strings.xml

@@ -292,7 +292,6 @@
 
     <string name="placeholder_sentence">Αυτό είναι ένα σημείο placeholder</string>
     <string name="placeholder_filename">placeholder.txt</string>
-    <string name="placeholder_filetype">Εικόνα PNG</string>
     <string name="placeholder_filesize">389 KB</string>
     <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
     <string name="placeholder_media_time">12:23:45</string>
@@ -408,10 +407,8 @@
     <string name="copy_file_error">Παρουσιάστηκε σφάλμα κατά την προσπάθεια αντιγραφής αυτού του αρχείου ή φακέλου</string>
     <string name="forbidden_permissions_copy">για αντιγραφή αυτού του αρχείου</string>
 
-    <string name="prefs_category_instant_uploading">Άμεσες μεταφορτώσεις</string>
     <string name="prefs_category_details">Λεπτομέρειες</string>
 
-	<string name="prefs_instant_video_upload_path_title">Φάκελος άμεσης μεταφόρτωσης βίντεο</string>
     <string name="sync_folder_failed_content">Ο συγχρονισμός του φακέλου %1$s δεν μπόρεσε να ολοκληρωθεί</string>
 
 	<string name="shared_subject_header">διαμοιρασμένα</string>

src/main/res/values-en-rGB/strings.xml

@@ -321,7 +321,6 @@
 
     <string name="placeholder_sentence">This is a placeholder</string>
     <string name="placeholder_filename">placeholder.txt</string>
-    <string name="placeholder_filetype">PNG image</string>
     <string name="placeholder_filesize">389 KB</string>
     <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
     <string name="placeholder_media_time">12:23:45</string>
@@ -439,10 +438,8 @@
     <string name="copy_file_error">An error occurred while trying to copy this file or folder</string>
     <string name="forbidden_permissions_copy">to copy this file</string>
 
-    <string name="prefs_category_instant_uploading">Instant uploads</string>
     <string name="prefs_category_details">Details</string>
 
-	<string name="prefs_instant_video_upload_path_title">Video folder for instant uploads</string>
     <string name="sync_folder_failed_content">Synchronisation of %1$s folder could not be completed</string>
 
 	<string name="shared_subject_header">shared</string>

src/main/res/values-es-rAR/strings.xml

@@ -289,7 +289,6 @@
 
     <string name="placeholder_sentence">Este es un marcador de posición</string>
     <string name="placeholder_filename">marcadordeposición.txt</string>
-    <string name="placeholder_filetype">Imagen PNG</string>
     <string name="placeholder_filesize">389 KB</string>
     <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
     <string name="placeholder_media_time">12:23:45</string>
@@ -403,10 +402,8 @@
     <string name="copy_file_error">Se presentó un error al intentar copiar este archivo o carpeta</string>
     <string name="forbidden_permissions_copy">para copiar este archivo</string>
 
-    <string name="prefs_category_instant_uploading">Cargas instantáneas</string>
     <string name="prefs_category_details">Detalles</string>
 
-	<string name="prefs_instant_video_upload_path_title">Carpeta de video para cargas instantáneas</string>
     <string name="sync_folder_failed_content">La sincronización de %1$s carpeta no se pudo completar</string>
 
 	<string name="shared_subject_header">compartido</string>

src/main/res/values-es-rCO/strings.xml

@@ -321,7 +321,6 @@
 
     <string name="placeholder_sentence">Este es un marcador de posición</string>
     <string name="placeholder_filename">marcadordeposición.txt</string>
-    <string name="placeholder_filetype">Imagen PNG</string>
     <string name="placeholder_filesize">389 KB</string>
     <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
     <string name="placeholder_media_time">12:23:45</string>
@@ -439,10 +438,8 @@
     <string name="copy_file_error">Se presentó un error al intentar copiar este archivo o carpeta</string>
     <string name="forbidden_permissions_copy">para copiar este archivo</string>
 
-    <string name="prefs_category_instant_uploading">Cargas automáticas</string>
     <string name="prefs_category_details">Detalles</string>
 
-	<string name="prefs_instant_video_upload_path_title">Carpeta de video para cargas automáticas</string>
     <string name="sync_folder_failed_content">La sincronización de %1$s carpeta no se pudo completar</string>
 
 	<string name="shared_subject_header">compartido</string>

src/main/res/values-es-rMX/strings.xml

@@ -321,7 +321,6 @@
 
     <string name="placeholder_sentence">Este es un marcador de posición</string>
     <string name="placeholder_filename">marcadordeposición.txt</string>
-    <string name="placeholder_filetype">Imagen PNG</string>
     <string name="placeholder_filesize">389 KB</string>
     <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
     <string name="placeholder_media_time">12:23:45</string>
@@ -439,10 +438,8 @@
     <string name="copy_file_error">Se presentó un error al intentar copiar este archivo o carpeta</string>
     <string name="forbidden_permissions_copy">para copiar este archivo</string>
 
-    <string name="prefs_category_instant_uploading">Cargas automáticas</string>
     <string name="prefs_category_details">Detalles</string>
 
-	<string name="prefs_instant_video_upload_path_title">Carpeta de video para cargas automáticas</string>
     <string name="sync_folder_failed_content">La sincronización de %1$s carpeta no se pudo completar</string>
 
 	<string name="shared_subject_header">compartido</string>

src/main/res/values-es/strings.xml

@@ -301,7 +301,6 @@
 
     <string name="placeholder_sentence">Esto es un marcador de posición</string>
     <string name="placeholder_filename">placeholder.txt</string>
-    <string name="placeholder_filetype">Imagen PNG</string>
     <string name="placeholder_filesize">389 KB</string>
     <string name="placeholder_timestamp">18/05/2012 12:23 PM</string>
     <string name="placeholder_media_time">12:23:45</string>
@@ -417,10 +416,8 @@
     <string name="copy_file_error">Hubo un error al tratar de copiar este archivo o carpeta</string>
     <string name="forbidden_permissions_copy">copiar este archivo</string>
 
-    <string name="prefs_category_instant_uploading">Subidas instantáneas</string>
     <string name="prefs_category_details">Detalles</string>
 
-	<string name="prefs_instant_video_upload_path_title">Carpeta para subida instantáneo de vídeos</string>
     <string name="sync_folder_failed_content">La sincronización de la carpeta %1$s no se ha podido completar</string>
 
 	<string name="shared_subject_header">compartido</string>

src/main/res/values-eu/strings.xml

@@ -295,7 +295,6 @@ Mesedez, baimendu berriz</string>
 
     <string name="placeholder_sentence">Hau leku-marka da</string>
     <string name="placeholder_filename">kokalekua.txt</string>
-    <string name="placeholder_filetype">PNG irudia</string>
     <string name="placeholder_filesize">389 KB</string>
     <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
     <string name="placeholder_media_time">12:23:45</string>

src/main/res/values-fa/strings.xml

@@ -277,7 +277,6 @@
 
     <string name="placeholder_sentence">این یک حفره است.</string>
     <string name="placeholder_filename">placeholder.txt</string>
-    <string name="placeholder_filetype">تصویر PNG</string>
     <string name="placeholder_filesize">389 کیلو بایت</string>
     <string name="placeholder_timestamp">2012/05/18 12:23 بعد از ظهر</string>
     <string name="placeholder_media_time">12:23:45</string>

src/main/res/values-fi-rFI/strings.xml

@@ -268,7 +268,6 @@
     <string name="ssl_validator_null_cert">Varmennetta ei voi näyttää.</string>
     <string name="ssl_validator_no_info_about_error">- Ei lisätietoja virheestä</string>
 
-    <string name="placeholder_filetype">PNG-kuva</string>
     <string name="placeholder_filesize">389 kt</string>
     <string name="placeholder_media_time">12:23:45</string>
 
@@ -355,7 +354,6 @@
     <string name="copy_file_error">Tätä tiedostoa tai kansiota kopioitaessa tapahtui virhe</string>
     <string name="forbidden_permissions_copy">kopioida tämä tiedosto</string>
 
-    <string name="prefs_category_instant_uploading">Välittömät lähetykset</string>
     <string name="prefs_category_details">Tiedot</string>
 
 	<string name="sync_folder_failed_content">Kansion %1$s synkronointia ei voitu suorittaa kokonaan</string>

src/main/res/values-fr/strings.xml

@@ -323,7 +323,6 @@ Attention la suppression est irréversible.</string>
 
     <string name="placeholder_sentence">Ceci est un espace réservé</string>
     <string name="placeholder_filename">placeholder.txt</string>
-    <string name="placeholder_filetype">Image PNG</string>
     <string name="placeholder_filesize">389 Ko</string>
     <string name="placeholder_timestamp">18/05/2012 12:23 PM</string>
     <string name="placeholder_media_time">12:23:45</string>
@@ -441,10 +440,8 @@ Attention la suppression est irréversible.</string>
     <string name="copy_file_error">Une erreur est survenue lors de la copie de ce fichier ou dossier</string>
     <string name="forbidden_permissions_copy">de copier ce fichier</string>
 
-    <string name="prefs_category_instant_uploading">Téléversement immédiat</string>
     <string name="prefs_category_details">Préférences</string>
 
-	<string name="prefs_instant_video_upload_path_title">Téléversement immédiat du dossier vidéos</string>
     <string name="sync_folder_failed_content">La synchronisation du dossier %1$s n\'a pas pu être terminée</string>
 
 	<string name="shared_subject_header">a partagé</string>

src/main/res/values-he/strings.xml

@@ -266,7 +266,6 @@
     <string name="copy_file_error">אירעה שגיאה בזמן ניסיון להעתיק את הקובץ או התיקייה</string>
     <string name="forbidden_permissions_copy">להעתיק את הקובץ הזה</string>
 
-    <string name="prefs_category_instant_uploading">העלאות מיידיות</string>
     <string name="prefs_category_details">פרטים</string>
 
 	<string name="sync_folder_failed_content">לא ניתן להשלים סנכרון של %1$s תיקיות</string>

src/main/res/values-hu-rHU/strings.xml

@@ -321,7 +321,6 @@
 
     <string name="placeholder_sentence">Ez egy helyőrző</string>
     <string name="placeholder_filename">helyörző.txt</string>
-    <string name="placeholder_filetype">PNG kép</string>
     <string name="placeholder_filesize">389 KB</string>
     <string name="placeholder_timestamp">2012/05/18 12:23</string>
     <string name="placeholder_media_time">12:23:45</string>
@@ -440,10 +439,8 @@
     <string name="copy_file_error">Hiba történt a fájl vagy mappa másolása közben</string>
     <string name="forbidden_permissions_copy">a fájl másolása</string>
 
-    <string name="prefs_category_instant_uploading">Azonnali feltöltések</string>
     <string name="prefs_category_details">Részletek</string>
 
-	<string name="prefs_instant_video_upload_path_title">Videó mappa az instant feltöltéshez</string>
     <string name="sync_folder_failed_content">%1$s mappa szinkronizációját nem lehet végrehajtani</string>
 
 	<string name="shared_subject_header">megosztva</string>

src/main/res/values-id/strings.xml

@@ -291,7 +291,6 @@
 
     <string name="placeholder_sentence">Ini adalah placeholder</string>
     <string name="placeholder_filename">placeholder.txt</string>
-    <string name="placeholder_filetype">Gambar PNG</string>
     <string name="placeholder_filesize">389 KB</string>
     <string name="placeholder_timestamp">18/05/2012 12:23 PM</string>
     <string name="placeholder_media_time">12:23:45</string>
@@ -404,10 +403,8 @@
     <string name="copy_file_error">Terjadi kesalahan ketika mencoba menyalin berkas atau folder ini</string>
     <string name="forbidden_permissions_copy">untuk menyalin berkas ini</string>
 
-    <string name="prefs_category_instant_uploading">Unggah cepat</string>
     <string name="prefs_category_details">Rincian</string>
 
-	<string name="prefs_instant_video_upload_path_title">Folder untuk mengunggah video cepat</string>
     <string name="sync_folder_failed_content">Sinkronisasi folder %1$s tidak dapat diselesaikan</string>
 
 	<string name="shared_subject_header">dibagikan</string>

src/main/res/values-is/strings.xml

@@ -292,7 +292,6 @@ Smelltu hér til að fá þér einn frá þjónustuaðila.</string>
 
     <string name="placeholder_sentence">Þetta er frátökutákn</string>
     <string name="placeholder_filename">frátökutákn.txt</string>
-    <string name="placeholder_filetype">PNG-mynd</string>
     <string name="placeholder_filesize">389 KB</string>
     <string name="placeholder_timestamp">2012/05/18 12:23 EH</string>
     <string name="placeholder_media_time">12:23:45</string>
@@ -408,10 +407,8 @@ Smelltu hér til að fá þér einn frá þjónustuaðila.</string>
     <string name="copy_file_error">Villa kom upp við að reyna að afrita þessa skrá eða möppu</string>
     <string name="forbidden_permissions_copy">til að afrita þessa skrá</string>
 
-    <string name="prefs_category_instant_uploading">Beinar innsendingar</string>
     <string name="prefs_category_details">Nánar</string>
 
-	<string name="prefs_instant_video_upload_path_title">Mappa fyrir beinar innsendingar myndskeiða</string>
     <string name="sync_folder_failed_content">Ekki var hægt að ljúka samstillingu á %1$s möppunni</string>
 
 	<string name="shared_subject_header">deilt</string>

src/main/res/values-it/strings.xml

@@ -321,7 +321,6 @@
 
     <string name="placeholder_sentence">Questo è un segnaposto</string>
     <string name="placeholder_filename">segnaposto.txt</string>
-    <string name="placeholder_filetype">Immagine PNG</string>
     <string name="placeholder_filesize">389 KB</string>
     <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
     <string name="placeholder_media_time">12:23:45</string>
@@ -439,10 +438,8 @@
     <string name="copy_file_error">Si è verificato un errore durante il tentativo di copiare il file o la cartella</string>
     <string name="forbidden_permissions_copy">per copiare questo file</string>
 
-    <string name="prefs_category_instant_uploading">Caricamenti istantanei</string>
     <string name="prefs_category_details">Dettagli</string>
 
-	<string name="prefs_instant_video_upload_path_title">Cartella dei video per caricamento automatico</string>
     <string name="sync_folder_failed_content">La sincronizzazione della cartella %1$s non può essere completata</string>
 
 	<string name="shared_subject_header">condiviso</string>

src/main/res/values-ja-rJP/strings.xml

@@ -323,7 +323,6 @@
     <string name="copy_file_error">このファイルまたはフォルダーをコピーする際にエラーが発生しました</string>
     <string name="forbidden_permissions_copy">このファイルをコピー</string>
 
-    <string name="prefs_category_instant_uploading">自動アップロード</string>
     <string name="prefs_category_details">詳細</string>
 
 	<string name="sync_folder_failed_content">%1$s フォルダーの同期が完了しませんでした。</string>

src/main/res/values-ko/strings.xml

@@ -257,7 +257,6 @@
 
     <string name="placeholder_sentence">이것은 자리 비움자입니다</string>
     <string name="placeholder_filename">placeholder.txt</string>
-    <string name="placeholder_filetype">PNG 이미지</string>
     <string name="placeholder_filesize">389KB</string>
     <string name="placeholder_timestamp">2012년 05월 18일 오후 12:23</string>
     <string name="placeholder_media_time">12:23:45</string>
@@ -341,7 +340,6 @@
     <string name="copy_file_error">이 파일이나 폴더를 복사할 수 없습니다</string>
     <string name="forbidden_permissions_copy">이 파일을 복사할</string>
 
-    <string name="prefs_category_instant_uploading">즉시 업로드</string>
     <string name="prefs_category_details">자세한 정보</string>
 
 	<string name="sync_folder_failed_content">%1$s  폴더의 동기화를 완료할 수 없습니다</string>

src/main/res/values-lt-rLT/strings.xml

@@ -293,7 +293,6 @@
 
     <string name="placeholder_sentence">Rezervas</string>
     <string name="placeholder_filename">rezervas.txt</string>
-    <string name="placeholder_filetype">PNG paveikslas</string>
     <string name="placeholder_filesize">389 KB</string>
     <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
     <string name="placeholder_media_time">12:23:45</string>
@@ -409,10 +408,8 @@
     <string name="copy_file_error">Klaida kopijuojant failą ar aplanką</string>
     <string name="forbidden_permissions_copy">kopijuoti failo</string>
 
-    <string name="prefs_category_instant_uploading">Momentiniai video įkėlimai</string>
     <string name="prefs_category_details">Informacija</string>
 
-	<string name="prefs_instant_video_upload_path_title">Vaizdo aplankas momentiniams įkėlimams</string>
     <string name="sync_folder_failed_content">%1$s sinchronizavimas negali būti užbaigtas.</string>
 
 	<string name="shared_subject_header">Dalinamasi</string>

src/main/res/values-lv/strings.xml

@@ -260,7 +260,6 @@
     <string name="copy_file_error">Radās kļūda, mēģinot kopēt šo failu vai mapi</string>
     <string name="forbidden_permissions_copy">lai kopētu šo datni</string>
 
-    <string name="prefs_category_instant_uploading">Tūlītējas augšupielādes</string>
     <string name="prefs_category_details">Detaļas</string>
 
 	<string name="shared_subject_header">koplietots</string>

src/main/res/values-nb-rNO/strings.xml

@@ -320,7 +320,6 @@
 
     <string name="placeholder_sentence">Dette er en plassholder</string>
     <string name="placeholder_filename">plassholder.txt</string>
-    <string name="placeholder_filetype">PNG-bilde</string>
     <string name="placeholder_filesize">389 KB</string>
     <string name="placeholder_timestamp">18.05.2012 12:23</string>
     <string name="placeholder_media_time">12:23:45</string>
@@ -438,10 +437,8 @@
     <string name="copy_file_error">En feil oppstod ved kopiering av denne filen eller mappen</string>
     <string name="forbidden_permissions_copy">å kopiere denne filen</string>
 
-    <string name="prefs_category_instant_uploading">Umiddelbare opplastinger</string>
     <string name="prefs_category_details">Detaljer</string>
 
-	<string name="prefs_instant_video_upload_path_title">Mappe for umiddelbar opplasting av filmer</string>
     <string name="sync_folder_failed_content">Synkronisering av %1$s mappe kunne ikke fullføres</string>
 
 	<string name="shared_subject_header">delt</string>

src/main/res/values-nl/strings.xml

@@ -322,7 +322,6 @@ Kies er eentje van een provider.</string>
 
     <string name="placeholder_sentence">Dit is een plaatshouder</string>
     <string name="placeholder_filename">plaatshouder.txt</string>
-    <string name="placeholder_filetype">PNG afbeelding</string>
     <string name="placeholder_filesize">389 KB</string>
     <string name="placeholder_timestamp">2012/05/18 12:23</string>
     <string name="placeholder_media_time">12:23:45</string>
@@ -440,10 +439,8 @@ Kies er eentje van een provider.</string>
     <string name="copy_file_error">Er trad een fout op bij het kopiëren van dit bestand of deze map</string>
     <string name="forbidden_permissions_copy">om dit bestand te kopiëren</string>
 
-    <string name="prefs_category_instant_uploading">Direct uploaden</string>
     <string name="prefs_category_details">Details</string>
 
-	<string name="prefs_instant_video_upload_path_title">Directe-uploadmap voor video\'s</string>
     <string name="sync_folder_failed_content">Synchronisatie van map %1$s kon niet worden voltooid</string>
 
 	<string name="shared_subject_header">gedeeld</string>

src/main/res/values-pl/strings.xml

@@ -321,7 +321,6 @@
 
     <string name="placeholder_sentence">Tekst zastępczy</string>
     <string name="placeholder_filename">placeholder.txt</string>
-    <string name="placeholder_filetype">obraz PNG</string>
     <string name="placeholder_filesize">389 KB</string>
     <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
     <string name="placeholder_media_time">12:23:45</string>
@@ -439,10 +438,8 @@
     <string name="copy_file_error">Wystąpił błąd podczas próby kopiowania tego pliku lub folderu</string>
     <string name="forbidden_permissions_copy">by skopiować ten plik</string>
 
-    <string name="prefs_category_instant_uploading">Natychmiastowe wysłanie</string>
     <string name="prefs_category_details">Szczegóły</string>
 
-	<string name="prefs_instant_video_upload_path_title">Folder wideo do natychmiastowego wysyłania</string>
     <string name="sync_folder_failed_content">Synchronizacja folderu %1$s nie może zostać zakończona</string>
 
 	<string name="shared_subject_header">udostępniony</string>

src/main/res/values-pt-rBR/strings.xml

@@ -321,7 +321,6 @@
 
     <string name="placeholder_sentence">Este é um espaço reservado</string>
     <string name="placeholder_filename">placeholder.txt</string>
-    <string name="placeholder_filetype">Imagem PNG</string>
     <string name="placeholder_filesize">389 KB</string>
     <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
     <string name="placeholder_media_time">12:23:45</string>
@@ -439,10 +438,8 @@
     <string name="copy_file_error">Ocorreu um erro ao tentar copiar este arquivo ou pasta</string>
     <string name="forbidden_permissions_copy">copiar este arquivo</string>
 
-    <string name="prefs_category_instant_uploading">Envio automático</string>
     <string name="prefs_category_details">Detalhes</string>
 
-	<string name="prefs_instant_video_upload_path_title">Pasta de vídeo para envios automáticos</string>
     <string name="sync_folder_failed_content">A sincronização da pasta %1$s não pôde ser finalizada</string>
 
 	<string name="shared_subject_header">compartilhado</string>

src/main/res/values-ro/strings.xml

@@ -272,7 +272,6 @@
     <string name="copy_file_error">A apărut o eroare în timpul copierii fișierului sau dosarului </string>
     <string name="forbidden_permissions_copy">să copiați acest fișier</string>
 
-    <string name="prefs_category_instant_uploading">Încărcări instantanee</string>
     <string name="prefs_category_details">Detalii</string>
 
 	<string name="sync_folder_failed_content">Sincronizarea dosarului %1$s nu a putut fi finalizată</string>

src/main/res/values-ru/strings.xml

@@ -292,7 +292,6 @@
 
     <string name="placeholder_sentence">Это заполнитель</string>
     <string name="placeholder_filename">placeholder.txt</string>
-    <string name="placeholder_filetype">Изображение PNG</string>
     <string name="placeholder_filesize">389 КБ</string>
     <string name="placeholder_timestamp">2012/05/18 12:23</string>
     <string name="placeholder_media_time">12:23:45</string>
@@ -408,10 +407,8 @@
     <string name="copy_file_error">Произошла ошибка при попытке копирования этого файла или каталога</string>
     <string name="forbidden_permissions_copy">для копирования этого файла</string>
 
-    <string name="prefs_category_instant_uploading">Немедленная выгрузка</string>
     <string name="prefs_category_details">Дополнительные</string>
 
-	<string name="prefs_instant_video_upload_path_title">Каталог для немедленной загрузки видео</string>
     <string name="sync_folder_failed_content">Синхронизация каталога %1$s не может быть завершена</string>
 
 	<string name="shared_subject_header">поделился</string>

src/main/res/values-sk-rSK/strings.xml

@@ -298,7 +298,6 @@
     <string name="copy_file_error">Počas kopírovania súboru alebo zložky sa vyskytla chyba</string>
     <string name="forbidden_permissions_copy">kopírovať súbor</string>
 
-    <string name="prefs_category_instant_uploading">Okamžité nahratia</string>
     <string name="prefs_category_details">Podrobnosti</string>
 
 	<string name="sync_folder_failed_content">Synchronizáciu priečinka %1$s nebolo možné dokončiť</string>

src/main/res/values-sl/strings.xml

@@ -291,7 +291,6 @@
 
     <string name="placeholder_sentence">To je vsebnik predmetov</string>
     <string name="placeholder_filename">vsebnik.txt</string>
-    <string name="placeholder_filetype">PNG slika</string>
     <string name="placeholder_filesize">389 KB</string>
     <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
     <string name="placeholder_media_time">12:23:45</string>
@@ -405,10 +404,8 @@
     <string name="copy_file_error">Prišlo je do napake med kopiranjem datoteke v mapo</string>
     <string name="forbidden_permissions_copy">za kopiranje te datoteke</string>
 
-    <string name="prefs_category_instant_uploading">Hipno pošiljanje</string>
     <string name="prefs_category_details">Podrobnosti</string>
 
-	<string name="prefs_instant_video_upload_path_title">Mapa s posnetki za hipno nalaganje</string>
     <string name="sync_folder_failed_content">Usklajevanja mape %1$s ni mogoče zaključiti</string>
 
 	<string name="shared_subject_header">v souporabi</string>

src/main/res/values-sq/strings.xml

@@ -317,7 +317,6 @@
 
     <string name="placeholder_sentence">Kjo është një vendmbajtëse</string>
     <string name="placeholder_filename">placeholder.txt</string>
-    <string name="placeholder_filetype">Imazh PNG</string>
     <string name="placeholder_filesize">389 KB</string>
     <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
     <string name="placeholder_media_time">12:23:45</string>
@@ -435,10 +434,8 @@
     <string name="copy_file_error">Ndodhi një gabim teksa përpiqej të kopjohej ky skedar apo kjo dosje</string>
     <string name="forbidden_permissions_copy">për kopjim të kësaj kartele</string>
 
-    <string name="prefs_category_instant_uploading">Ngarkime të menjëhershme</string>
     <string name="prefs_category_details">Hollësi</string>
 
-	<string name="prefs_instant_video_upload_path_title">Dosja e ngarkimit të videove të çastit </string>
     <string name="sync_folder_failed_content">Sinkronizimi i i dosjes %1$s nuk u plotësua dot</string>
 
 	<string name="shared_subject_header">ndarë</string>

src/main/res/values-sr/strings.xml

@@ -321,7 +321,6 @@
 
     <string name="placeholder_sentence">Ово је местодржач</string>
     <string name="placeholder_filename">чувамместо.txt</string>
-    <string name="placeholder_filetype">ПНГ слика</string>
     <string name="placeholder_filesize">389 KB</string>
     <string name="placeholder_timestamp">2012/05/18 12:23 ПоП</string>
     <string name="placeholder_media_time">12:23:45</string>
@@ -439,10 +438,8 @@
     <string name="copy_file_error">Грешка приликом копирања овог фајла или фасцикле</string>
     <string name="forbidden_permissions_copy">да копирате овај фајл</string>
 
-    <string name="prefs_category_instant_uploading">Брза отпремања</string>
     <string name="prefs_category_details">Подаци</string>
 
-	<string name="prefs_instant_video_upload_path_title">Фасцикла за видео записе за брзо отпремање</string>
     <string name="sync_folder_failed_content">Не могу да довршим синхронизацију фасцикле %1$s</string>
 
 	<string name="shared_subject_header">дељено</string>

src/main/res/values-sv/strings.xml

@@ -292,7 +292,6 @@
 
     <string name="placeholder_sentence">Detta är en platshållare</string>
     <string name="placeholder_filename">placeholder.txt</string>
-    <string name="placeholder_filetype">PNG-bild</string>
     <string name="placeholder_filesize">389 KB</string>
     <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
     <string name="placeholder_media_time">12:23:45</string>
@@ -408,10 +407,8 @@
     <string name="copy_file_error">Ett fel uppstod, kunde inte kopiera filen eller mappen</string>
     <string name="forbidden_permissions_copy">att kopiera denna fil</string>
 
-    <string name="prefs_category_instant_uploading">Automatiska uppladdningar</string>
     <string name="prefs_category_details">Detaljer</string>
 
-	<string name="prefs_instant_video_upload_path_title">Videomapp för Automatisk uppladdning</string>
     <string name="sync_folder_failed_content">Synkronisering av %1$s mapp kunde inte slutföras</string>
 
 	<string name="shared_subject_header">delad</string>

src/main/res/values-tr/strings.xml

@@ -322,7 +322,6 @@
 
     <string name="placeholder_sentence">Bu bir yer belirleyicidir</string>
     <string name="placeholder_filename">yerbelirleyici.txt</string>
-    <string name="placeholder_filetype">PNG Görseli</string>
     <string name="placeholder_filesize">389 KB</string>
     <string name="placeholder_timestamp">2012/05/18 12:23 ÖS</string>
     <string name="placeholder_media_time">12:23:45</string>
@@ -440,10 +439,8 @@
     <string name="copy_file_error">Bu dosya ya da klasör kopyalanmaya çalışılırken bir sorun çıktı</string>
     <string name="forbidden_permissions_copy">bu dosyayı kopyalayın</string>
 
-    <string name="prefs_category_instant_uploading">Anında yüklemeler</string>
     <string name="prefs_category_details">Ayrıntılar</string>
 
-	<string name="prefs_instant_video_upload_path_title">Anında görüntü yükleme klasörü</string>
     <string name="sync_folder_failed_content">%1$s klasörünün eşitlemesi tamamlanamadı</string>
 
 	<string name="shared_subject_header">sizinle</string>

src/main/res/values-zh-rCN/strings.xml

@@ -296,7 +296,6 @@
 
     <string name="placeholder_sentence">占位符</string>
     <string name="placeholder_filename">点位符.txt</string>
-    <string name="placeholder_filetype">PNG 图片</string>
     <string name="placeholder_filesize">389字节</string>
     <string name="placeholder_timestamp">2012/05/18 下午12:23 </string>
     <string name="placeholder_media_time">12:23:45</string>
@@ -412,10 +411,8 @@
     <string name="copy_file_error">尝试复制这个文件或文件夹时发生了错误</string>
     <string name="forbidden_permissions_copy">复制这个文件</string>
 
-    <string name="prefs_category_instant_uploading">即时上传</string>
     <string name="prefs_category_details">详细信息</string>
 
-	<string name="prefs_instant_video_upload_path_title">用于即时上传的视频文件夹</string>
     <string name="sync_folder_failed_content"> %1$s同步未完成。</string>
 
 	<string name="shared_subject_header">已共享</string>

src/main/res/values-zh-rTW/strings.xml

@@ -276,7 +276,6 @@
 
     <string name="placeholder_sentence">這是佔位內容</string>
     <string name="placeholder_filename">placeholder.txt</string>
-    <string name="placeholder_filetype">PNG 圖檔</string>
     <string name="placeholder_filesize">389 KB</string>
     <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
     <string name="placeholder_media_time">12:23:45</string>
@@ -389,10 +388,8 @@
     <string name="copy_file_error">嘗試複製檔案或資料夾時發生錯誤</string>
     <string name="forbidden_permissions_copy">複製這個檔案</string>
 
-    <string name="prefs_category_instant_uploading">即時上傳</string>
     <string name="prefs_category_details">詳細資料</string>
 
-	<string name="prefs_instant_video_upload_path_title">即時上傳的影片資料夾</string>
     <string name="sync_folder_failed_content">%1$s 資料夾的同步作業未完成</string>
 
 	<string name="shared_subject_header">已分享</string>

src/main/res/values/dims.xml

@@ -60,7 +60,6 @@
     <dimen name="display_text_min_height">32dp</dimen>
     <dimen name="divider_height_independent">1dip</dimen>
     <dimen name="alternate_padding_independent">10dip</dimen>
-    <dimen name="standard_half_padding_independent">8dip</dimen>
     <dimen name="activity_row_layout_min_width_independent">196dip</dimen>
     <dimen name="user_icon_size_independent">40dip</dimen>
     <dimen name="drawer_header_text">14sp</dimen>

src/main/res/values/strings.xml

@@ -330,7 +330,6 @@
 
     <string name="placeholder_sentence">This is a placeholder</string>
     <string name="placeholder_filename">placeholder.txt</string>
-    <string name="placeholder_filetype">PNG image</string>
     <string name="placeholder_filesize">389 KB</string>
     <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
     <string name="placeholder_media_time">12:23:45</string>
@@ -448,10 +447,8 @@
     <string name="copy_file_error">An error occurred while trying to copy this file or folder</string>
     <string name="forbidden_permissions_copy">to copy this file</string>
 
-    <string name="prefs_category_instant_uploading">Instant uploads</string>
     <string name="prefs_category_details">Details</string>
 
-	<string name="prefs_instant_video_upload_path_title">Video folder for instant uploads</string>
     <string name="sync_folder_failed_content">Synchronization of %1$s folder could not be completed</string>
 
 	<string name="shared_subject_header">shared</string>