diff --git a/FacebookImagePicker/OLAlbumViewController.m b/FacebookImagePicker/OLAlbumViewController.m
index afcfafd..44b36c8 100644
--- a/FacebookImagePicker/OLAlbumViewController.m
+++ b/FacebookImagePicker/OLAlbumViewController.m
@@ -77,7 +77,7 @@ @implementation OLAlbumViewController
 - (id)init {
     NSBundle *currentBundle = [NSBundle bundleForClass:[OLAlbumViewController class]];
     if (self = [self initWithNibName:NSStringFromClass([OLAlbumViewController class]) bundle:currentBundle]) {
-        self.title = @"Photos";
+        self.title = NSLocalizedStringWithDefaultValue(@"ol.albumview.title", nil, [NSBundle mainBundle], @"Photos", nil);
         self.albums = [[NSMutableArray alloc] init];
     }
     return self;
@@ -86,9 +86,15 @@ - (id)init {
 - (void)viewDidLoad {
     [super viewDidLoad];
     self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
-    self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"Done" style:UIBarButtonItemStyleDone target:self action:@selector(onButtonDoneClicked)];
+    self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedStringWithDefaultValue(@"ol.albumview.button.done", nil, [NSBundle mainBundle], @"Done", nil)
+                                                                              style:UIBarButtonItemStyleDone
+                                                                             target:self
+                                                                             action:@selector(onButtonDoneClicked)];
     
-    self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"Logout" style:UIBarButtonItemStylePlain target:self action:@selector(onButtonLogoutClicked)];
+    self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedStringWithDefaultValue(@"ol.albumview.button.logout", nil, [NSBundle mainBundle], @"Logout", nil)
+                                                                             style:UIBarButtonItemStylePlain
+                                                                            target:self
+                                                                            action:@selector(onButtonLogoutClicked)];
     
     self.albumRequestForNextPage = [[OLFacebookAlbumRequest alloc] init];
     [self loadNextAlbumPage];
diff --git a/FacebookImagePicker/OLPhotoViewController.m b/FacebookImagePicker/OLPhotoViewController.m
index df29d6e..cb0d5de 100644
--- a/FacebookImagePicker/OLPhotoViewController.m
+++ b/FacebookImagePicker/OLPhotoViewController.m
@@ -49,7 +49,10 @@ - (id)initWithAlbum:(OLFacebookAlbum *)album {
 - (void)viewDidLoad {
     [super viewDidLoad];
     
-    self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"Done" style:UIBarButtonItemStyleDone target:self action:@selector(onButtonDoneClicked)];
+    self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedStringWithDefaultValue(@"ol.photoview.button.done", nil, [NSBundle mainBundle], @"Done", nil)
+                                                                              style:UIBarButtonItemStyleDone
+                                                                             target:self
+                                                                             action:@selector(onButtonDoneClicked)];
     
     CGFloat itemSize = MIN([UIScreen mainScreen].bounds.size.height, [UIScreen mainScreen].bounds.size.width)/4.0 - 1.0;
     
@@ -163,11 +166,16 @@ -(void) updateTitleWithSelectedIndexPaths:(NSArray *)indexPaths{
     if (indexPaths.count == 0)
     {
         self.title = self.album.name;
-        return;
     }
-    
-    NSString *format = (indexPaths.count > 1) ? NSLocalizedString(@"%ld Photos Selected", nil) : NSLocalizedString(@"%ld Photo Selected", nil);
-    self.title = [NSString stringWithFormat:format, (unsigned long)indexPaths.count];
+    else if (indexPaths.count == 1)
+    {
+        self.title = NSLocalizedStringWithDefaultValue(@"ol.photoview.1photoselected", nil, [NSBundle mainBundle], @"1 Photo Selected", nil);
+    }
+    else
+    {
+        self.title = [NSLocalizedStringWithDefaultValue(@"ol.photoview.nbphotoselected", nil, [NSBundle mainBundle], @"##count## Photos Selected", nil)
+                      stringByReplacingOccurrencesOfString:@"##count##" withString:[NSString stringWithFormat:@"%ld", (unsigned long)indexPaths.count]];
+    }
 }
 
 #pragma mark - UICollectionViewDataSource methods