Merge pull request #11439 from hotzenklotz/814856

Bug 814856 - SD card should be replaced with more generic, r=kaze
mozilla-b2g · Sep 11, 2013 · 9da5613 · 9da5613
2 parents 6fceee1 + b9450a6
commit 9da5613
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/apps/camera/js/camera.js b/apps/camera/js/camera.js
@@ -1029,7 +1029,7 @@ var Camera = {
       this.stopRecording();
       this.sizeLimitAlertActive = true;
       var alertText = this._pendingPick ? 'activity-size-limit-reached' :
-        'size-limit-reached';
+        'storage-size-limit-reached';
       alert(navigator.mozL10n.get(alertText));
       this.sizeLimitAlertActive = false;
     }

diff --git a/apps/camera/locales/camera.en-US.properties b/apps/camera/locales/camera.en-US.properties
@@ -13,7 +13,7 @@ nocard2-text  = Insert a memory card to take pictures or select an alternate def
 pluggedin-title = Camera can not be used while plugged in
 pluggedin-text  = Unplug the phone to view pictures.
 
-size-limit-reached = You have run out of space on your SD card.
+storage-size-limit-reached = You have run out of media storage space.
 activity-size-limit-reached = You have reached the maximum file size for this attachment.
 
 retake-button = Retake

diff --git a/apps/settings/elements/application_storage.html b/apps/settings/elements/application_storage.html
@@ -27,9 +27,8 @@ <h1 data-l10n-id="appStorage"> Application Storage </h1>
             <span id="apps-free-space"></span>
           </a>
         </li>
-        <li class="description" data-l10n-id="media-storage-details">
-          Photos, videos, and music are stored in the SD Card.
-          See Media Storage for details.
+        <li class="description" data-l10n-id="storage-details">
+          Photos, videos and music are stored separately from apps. See media storage for details.
         </li>
       </ul>
     </div>

diff --git a/apps/settings/locales/settings.en-US.properties b/apps/settings/locales/settings.en-US.properties
@@ -508,7 +508,7 @@ availableSize[other] = {{size}} {{unit}} available
 apps-total-space=Total space
 apps-used-space=Used
 apps-free-space=Left
-media-storage-details=Photos, videos and music are stored on the SD card. See media storage for details.
+storage-details=Photos, videos and music are stored separately from apps. See media storage for details.
 ums-shared-volumes = {{list}} shared
 
 # Storage :: Media storage