Skip to content

Commit

Permalink
Initialize camera upload sync timestamps and refactor code in Prefere…
Browse files Browse the repository at this point in the history
…nces
  • Loading branch information
davigonz committed Nov 6, 2017
1 parent e1b7689 commit e2dfae5
Show file tree
Hide file tree
Showing 75 changed files with 1,089 additions and 974 deletions.
2 changes: 1 addition & 1 deletion res/layout/upload_list_item.xml
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
android:textColor="@color/list_item_lastmod_and_filesize_text"
android:ellipsize="middle"
android:singleLine="true"
android:text="@string/instant_upload_path"
android:text="@string/camera_upload_path"
android:textSize="12dip"/>

</LinearLayout>
Expand Down
6 changes: 3 additions & 3 deletions res/values-af-rZA/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
<string name="prefs_accounts">Rekeninge</string>
<string name="prefs_manage_accounts">Bestuur rekeninge</string>
<string name="prefs_passcode">Wagkodeslot</string>
<string name="prefs_instant_upload">Kitsbeeldoplaai</string>
<string name="prefs_instant_upload_summary">Laai kamerabeelde in ’n japtrap op</string>
<string name="prefs_camera_picture_upload">Kitsbeeldoplaai</string>
<string name="prefs_camera_picture_upload_summary">Laai kamerabeelde in ’n japtrap op</string>
<string name="prefs_help">Hulp</string>
<string name="prefs_feedback">Terugvoer</string>
<string name="prefs_imprint">Afdruk</string>
Expand Down Expand Up @@ -77,7 +77,7 @@
<string name="ssl_validator_btn_details_see">Details</string>
<string name="ssl_validator_label_C">Land:</string>
<string name="ssl_validator_label_L">Ligging:</string>
<string name="prefs_instant_upload_path_title">Oplaaipad</string>
<string name="prefs_camera_upload_path_title">Oplaaipad</string>
<string name="share_link_password_title">Voer ’n wagwoord in</string>
<string name="share_link_empty_password">U moet ’n wagwoord invoer</string>
<string name="activity_chooser_send_file_title">Stuur</string>
Expand Down
10 changes: 5 additions & 5 deletions res/values-ar/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@
<string name="prefs_accounts">حسابات</string>
<string name="prefs_manage_accounts">إدارة الحسابات</string>
<string name="prefs_passcode">الرقم السري</string>
<string name="prefs_instant_upload">رفع الصورة مباشرة</string>
<string name="prefs_instant_upload_summary">رفع صورة المؤخذة عبر الكاميرا</string>
<string name="prefs_instant_video_upload">رفع فيديو مباشرة</string>
<string name="prefs_instant_video_upload_summary">رفع فيديو مباشرة من الكاميرا</string>
<string name="prefs_camera_picture_upload">رفع الصورة مباشرة</string>
<string name="prefs_camera_picture_upload_summary">رفع صورة المؤخذة عبر الكاميرا</string>
<string name="prefs_camera_video_upload">رفع فيديو مباشرة</string>
<string name="prefs_camera_video_upload_summary">رفع فيديو مباشرة من الكاميرا</string>
<string name="prefs_log_summary">يستخدم هذا لتسجيل المشاكل</string>
<string name="prefs_log_summary_history">هذا يعرض السجلات المسجلة</string>
<string name="prefs_help">المساعدة</string>
Expand Down Expand Up @@ -241,7 +241,7 @@
<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>
<string name="instant_upload_path">/InstantUpload</string>
<string name="camera_upload_path">/InstantUpload</string>
<string name="conflict_keep_both">الاحتفاظ بالنسختين</string>
<string name="preview_image_description">معاينة الصورة</string>
<string name="preview_image_error_unknown_format">لا يمكن عرض هذه الصورة</string>
Expand Down
10 changes: 5 additions & 5 deletions res/values-az/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
<string name="prefs_category_general">Ümumi</string>
<string name="prefs_category_more">Daha da</string>
<string name="prefs_accounts">Hesablar</string>
<string name="prefs_instant_upload">Ani şəkil yükləmələri</string>
<string name="prefs_instant_upload_summary">Kamera vasitəsi ilə götürülmüş şəkillərin tez yüklənməsi</string>
<string name="prefs_instant_video_upload">Ani video yükləmələri</string>
<string name="prefs_instant_video_upload_summary">Kamera vasitəsi ilə yazılmış videoların tez yüklənməsi</string>
<string name="prefs_camera_picture_upload">Ani şəkil yükləmələri</string>
<string name="prefs_camera_picture_upload_summary">Kamera vasitəsi ilə götürülmüş şəkillərin tez yüklənməsi</string>
<string name="prefs_camera_video_upload">Ani video yükləmələri</string>
<string name="prefs_camera_video_upload_summary">Kamera vasitəsi ilə yazılmış videoların tez yüklənməsi</string>
<string name="prefs_log_summary">Bu problemlərin jurnal edilməsi üçün istifadə edilir</string>
<string name="prefs_log_summary_history">Bu, yazılmış jurnalları göstərir</string>
<string name="prefs_help">Kömək</string>
Expand Down Expand Up @@ -196,7 +196,7 @@ Aşağıda göstərilən %5$s-də olan daxili və xarici fayl(lar) link edilmiş
<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>
<string name="instant_upload_path">/CəldYükləmə</string>
<string name="camera_upload_path">/CəldYükləmə</string>
<string name="conflict_keep_both">Birlikdə saxla</string>
<string name="preview_image_description">Şəkili göstər</string>
<string name="preview_image_error_unknown_format">Bu şəkil göstərilə bilməz</string>
Expand Down
30 changes: 15 additions & 15 deletions res/values-bg-rBG/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@
<string name="prefs_accounts">Профили</string>
<string name="prefs_manage_accounts">Управление на профилите</string>
<string name="prefs_passcode">Заключваща парола</string>
<string name="prefs_instant_upload">Незабавно качване на снимки</string>
<string name="prefs_instant_upload_summary">Незабвано качване на снимки направени с камерата</string>
<string name="prefs_instant_video_upload">Незабавно качване на видео</string>
<string name="prefs_instant_video_upload_summary">Незабавно качване на видеота записани от камерата.</string>
<string name="prefs_camera_picture_upload">Незабавно качване на снимки</string>
<string name="prefs_camera_picture_upload_summary">Незабвано качване на снимки направени с камерата</string>
<string name="prefs_camera_video_upload">Незабавно качване на видео</string>
<string name="prefs_camera_video_upload_summary">Незабавно качване на видеота записани от камерата.</string>
<string name="prefs_log_title">Разреши влизане</string>
<string name="prefs_log_summary">Използва се за докладване на проблеми</string>
<string name="prefs_log_title_history">История на влизанията</string>
Expand Down Expand Up @@ -283,9 +283,9 @@
<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>
<string name="instant_upload_on_wifi">Качване на снимки само през WiFi</string>
<string name="instant_video_upload_on_wifi">Качване на видео само през WiFi</string>
<string name="instant_upload_path">/InstantUpload</string>
<string name="camera_picture_upload_on_wifi">Качване на снимки само през WiFi</string>
<string name="camera_video_upload_on_wifi">Качване на видео само през WiFi</string>
<string name="camera_upload_path">/InstantUpload</string>
<string name="conflict_title">Файлов конфликт</string>
<string name="conflict_message">Кои файлове искаш за да запазиш? Ако избереш и двете версии, локалния файл ще има цифри добавени към името си.</string>
<string name="conflict_keep_both">Запазване и на двата</string>
Expand All @@ -294,7 +294,7 @@
<string name="preview_image_description">Преглед на изображението</string>
<string name="preview_image_error_unknown_format">Изображението не може да бъде показано</string>
<string name="error__upload__local_file_not_copied">%1$s не може да бъде копиран в локалната папка %2$s</string>
<string name="prefs_instant_upload_path_title">Път за качване</string>
<string name="prefs_camera_upload_path_title">Път за качване</string>
<string name="share_link_no_support_share_api">За съжаление споделянето не е включено на сървъра ви.
Моля, свържете се с администратора.</string>
<string name="share_link_file_no_exist">Неуспешен опит за споделяне. Моля, провери дали файла съществува.</string>
Expand Down Expand Up @@ -347,9 +347,9 @@
<string name="copy_file_invalid_overwrite">Файлът вече съществува в отдалечената папка.</string>
<string name="copy_file_error">Настъпи грешка при опита за копиране на този файл или папка.</string>
<string name="forbidden_permissions_copy">да копира този файл</string>
<string name="prefs_category_instant_uploading">Незабавно качване</string>
<string name="prefs_category_camera_upload">Незабавно качване</string>
<string name="prefs_category_details">Подробности</string>
<string name="prefs_instant_video_upload_path_title">Път за качване на видеа</string>
<string name="prefs_camera_video_upload_path_title">Път за качване на видеа</string>
<string name="sync_folder_failed_content">Синхронизацията на папка %1$s не може да бъде завършена.</string>
<string name="shared_subject_header">споделен</string>
<string name="with_you_subject_header">с теб</string>
Expand All @@ -367,11 +367,11 @@
<string name="file_list__footer__files">%1$d файла</string>
<string name="file_list__footer__files_and_folder">%1$d файла, 1 папка</string>
<string name="file_list__footer__files_and_folders">%1$d файла, %2$d папки</string>
<string name="prefs_instant_upload_source_path_title">Папка за камерата (%1$s)</string>
<string name="prefs_instant_upload_source_path_title_required">задължителен</string>
<string name="prefs_instant_upload_source_path_title_optional">по избор</string>
<string name="prefs_instant_behaviour_dialogTitle">Оригиналният файл ще бъде...</string>
<string name="prefs_instant_behaviour_title">Оригиналният файл ще бъде...</string>
<string name="prefs_camera_upload_source_path_title">Папка за камерата (%1$s)</string>
<string name="prefs_camera_upload_source_path_title_required">задължителен</string>
<string name="prefs_camera_upload_source_path_title_optional">по избор</string>
<string name="prefs_camera_upload_behaviour_dialogTitle">Оригиналният файл ще бъде...</string>
<string name="prefs_camera_upload_behaviour_title">Оригиналният файл ще бъде...</string>
<string name="upload_copy_files">Копиране на файл</string>
<string name="upload_move_files">Преместване на файл</string>
<string name="pref_behaviour_entries_keep_file">запази в оригиналната папка</string>
Expand Down
10 changes: 5 additions & 5 deletions res/values-bn-rBD/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
<string name="prefs_category_general">সাধারণ</string>
<string name="prefs_category_more">বেশী</string>
<string name="prefs_accounts">একাউন্ট</string>
<string name="prefs_instant_upload">দ্রুত ছবি আপলোড</string>
<string name="prefs_instant_upload_summary">ক্যামেরা থেকে তোলা ছবি তৎক্ষণাৎ আপলোড</string>
<string name="prefs_instant_video_upload">দ্রুত ভিডিও আপলোড</string>
<string name="prefs_instant_video_upload_summary">ক্যামেরায় রেকর্ড করা ভিডিও তৎক্ষণাৎ আপলোড</string>
<string name="prefs_camera_picture_upload">দ্রুত ছবি আপলোড</string>
<string name="prefs_camera_picture_upload_summary">ক্যামেরা থেকে তোলা ছবি তৎক্ষণাৎ আপলোড</string>
<string name="prefs_camera_video_upload">দ্রুত ভিডিও আপলোড</string>
<string name="prefs_camera_video_upload_summary">ক্যামেরায় রেকর্ড করা ভিডিও তৎক্ষণাৎ আপলোড</string>
<string name="prefs_log_summary">সমস্যা তালিকাভুক্ত করার জায়গা</string>
<string name="prefs_log_summary_history">রেকর্ডেড লগ এখানে দেখেন</string>
<string name="prefs_help">সহায়িকা</string>
Expand Down Expand Up @@ -183,7 +183,7 @@
<string name="placeholder_filesize">৩৮৯ কেবি</string>
<string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
<string name="placeholder_media_time">12:23:45</string>
<string name="instant_upload_path">/তাৎক্ষণিক আপলোড</string>
<string name="camera_upload_path">/তাৎক্ষণিক আপলোড</string>
<string name="conflict_keep_both">উভয়কে রাখ</string>
<string name="preview_image_description">ছবি প্রাকদর্শন</string>
<string name="preview_image_error_unknown_format">ছবিটি প্রদর্শন করা যাবেনা</string>
Expand Down
22 changes: 11 additions & 11 deletions res/values-ca/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@
<string name="prefs_accounts">Comptes</string>
<string name="prefs_manage_accounts">Gestió de comptes</string>
<string name="prefs_passcode">Contrasenya</string>
<string name="prefs_instant_upload">Pujada instantànies de fotografies</string>
<string name="prefs_instant_upload_summary">Puja instantàniament les fotografies preses amb la càmera</string>
<string name="prefs_instant_video_upload">Pujades de vídeos instantanies</string>
<string name="prefs_instant_video_upload_summary">Pujar instantàniament vídeos gravats per la càmera</string>
<string name="prefs_camera_picture_upload">Pujada instantànies de fotografies</string>
<string name="prefs_camera_picture_upload_summary">Puja instantàniament les fotografies preses amb la càmera</string>
<string name="prefs_camera_video_upload">Pujades de vídeos instantanies</string>
<string name="prefs_camera_video_upload_summary">Pujar instantàniament vídeos gravats per la càmera</string>
<string name="prefs_log_title">Habilita els registres</string>
<string name="prefs_log_summary">Això s\'usa per registrar problemes</string>
<string name="prefs_log_title_history">Historial dels registres</string>
Expand Down Expand Up @@ -268,9 +268,9 @@
<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>
<string name="instant_upload_on_wifi">Pujar les fotos només via WiFi</string>
<string name="instant_video_upload_on_wifi">Pujar videos només via WiFi</string>
<string name="instant_upload_path">/CarregaInstantània</string>
<string name="camera_picture_upload_on_wifi">Pujar les fotos només via WiFi</string>
<string name="camera_video_upload_on_wifi">Pujar videos només via WiFi</string>
<string name="camera_upload_path">/CarregaInstantània</string>
<string name="conflict_title">Conflicte de fitxers</string>
<string name="conflict_message">Quins fitxers vols mantenir? Si seleccioneu les dues versions, el fitxer local tindrà un número afegit al seu nom.</string>
<string name="conflict_keep_both">Mantén-los ambdós</string>
Expand Down Expand Up @@ -324,7 +324,7 @@
<string name="copy_file_not_found">No es pot copiar. Assegureu-vos que el fitxer existeix</string>
<string name="copy_file_invalid_overwrite">El fitxer ja existeix a la carpeta de destinació</string>
<string name="forbidden_permissions_copy">per copiar aquest fitxer</string>
<string name="prefs_category_instant_uploading">Pujades instantanies</string>
<string name="prefs_category_camera_upload">Pujades instantanies</string>
<string name="prefs_category_details">Detalls</string>
<string name="shared_subject_header">compartit</string>
<string name="with_you_subject_header">amb tú</string>
Expand All @@ -340,9 +340,9 @@
<string name="file_list__footer__files">%1$d fitxers</string>
<string name="file_list__footer__files_and_folder">%1$d fitxers, 1 carpeta</string>
<string name="file_list__footer__files_and_folders">%1$d fitxers, %2$d carpetes</string>
<string name="prefs_instant_upload_source_path_title_optional">opcional</string>
<string name="prefs_instant_behaviour_dialogTitle">El fitxer original serà...</string>
<string name="prefs_instant_behaviour_title">El fitxer original serà...</string>
<string name="prefs_camera_upload_source_path_title_optional">opcional</string>
<string name="prefs_camera_upload_behaviour_dialogTitle">El fitxer original serà...</string>
<string name="prefs_camera_upload_behaviour_title">El fitxer original serà...</string>
<string name="upload_copy_files">Copiar fitxer</string>
<string name="upload_move_files">Moure fitxer</string>
<string name="pref_behaviour_entries_keep_file">conserva\'t en la carpeta original</string>
Expand Down
Loading

0 comments on commit e2dfae5

Please sign in to comment.