From 78db2b0639370f13f8d5c2590bf2b82ad843b338 Mon Sep 17 00:00:00 2001
From: Baligh Uddin <baligh@google.com>
Date: Wed, 13 Nov 2013 18:56:04 -0800
Subject: [PATCH] Import translations. DO NOT MERGE

Change-Id: I7fdd7cc0fea389d1be31016de687d65127289968
Auto-generated-cl: translation import
---
 res/values-fa/strings.xml |  2 +-
 res/values-nb/strings.xml | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 570eabb44..48ed4a726 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -138,7 +138,7 @@
     <string name="focal_length" msgid="1291383769749877010">"فاصله کانونی"</string>
     <string name="white_balance" msgid="1582509289994216078">"توازن سفیدی"</string>
     <string name="exposure_time" msgid="3990163680281058826">"زمان نوردهی"</string>
-    <string name="iso" msgid="5028296664327335940">"‏سرعت ISO"</string>
+    <string name="iso" msgid="5028296664327335940">"ایزو"</string>
     <string name="unit_mm" msgid="1125768433254329136">"میلیمتر"</string>
     <string name="manual" msgid="6608905477477607865">"دستی"</string>
     <string name="auto" msgid="4296941368722892821">"خودکار"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index d3f4de8c1..f2400814a 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -116,7 +116,7 @@
     <string name="no_albums_alert" msgid="4111744447491690896">"Ingen album tilgjengelig."</string>
     <string name="empty_album" msgid="4542880442593595494">"0 bilder/videoer tilgjengelig."</string>
     <string name="picasa_posts" msgid="1497721615718760613">"Innlegg"</string>
-    <string name="make_available_offline" msgid="5157950985488297112">"Gjør tilgjengelig i frakoblet modus"</string>
+    <string name="make_available_offline" msgid="5157950985488297112">"Gjør tilgjengelig uten nett"</string>
     <string name="sync_picasa_albums" msgid="8522572542111169872">"Last inn på nytt"</string>
     <string name="done" msgid="217672440064436595">"Ferdig"</string>
     <string name="sequence_in_set" msgid="7235465319919457488">"%1$d av %2$d elementer:"</string>
@@ -156,10 +156,10 @@
     <string name="ffx_washout" msgid="4594160692176642735">"Latte"</string>
     <string name="ffx_washout_color" msgid="8034075742195795219">"Litografi"</string>
   <plurals name="make_albums_available_offline">
-    <item quantity="one" msgid="2171596356101611086">"Gjør album tilgjengelig i frakoblet modus."</item>
-    <item quantity="other" msgid="4948604338155959389">"Gjør album tilgjengelige i frakoblet modus."</item>
+    <item quantity="one" msgid="2171596356101611086">"Gjør album tilgjengelig uten nett."</item>
+    <item quantity="other" msgid="4948604338155959389">"Gjør album tilgjengelig uten nett."</item>
   </plurals>
-    <string name="try_to_set_local_album_available_offline" msgid="2184754031896160755">"Dette elementet lagres lokalt og er tilgjengelig i frakoblet modus."</string>
+    <string name="try_to_set_local_album_available_offline" msgid="2184754031896160755">"Dette elementet lagres lokalt og er tilgjengelig uten nett."</string>
     <string name="set_label_all_albums" msgid="4581863582996336783">"Alle album"</string>
     <string name="set_label_local_albums" msgid="6698133661656266702">"Lokale album"</string>
     <string name="set_label_mtp_devices" msgid="1283513183744896368">"MTP-enheter"</string>
@@ -172,7 +172,7 @@
     <string name="import_complete" msgid="3875040287486199999">"Importen er fullført"</string>
     <string name="import_fail" msgid="8497942380703298808">"Import mislyktes"</string>
     <string name="camera_connected" msgid="916021826223448591">"Kamera tilkoblet."</string>
-    <string name="camera_disconnected" msgid="2100559901676329496">"Kamera frakoblet."</string>
+    <string name="camera_disconnected" msgid="2100559901676329496">"Kameraet er frakoblet."</string>
     <string name="click_import" msgid="6407959065464291972">"Trykk her for å importere"</string>
     <string name="widget_type_album" msgid="6013045393140135468">"Velg et album"</string>
     <string name="widget_type_shuffle" msgid="8594622705019763768">"Stokk om på bildene"</string>
-- 
2.11.0