Bgerstle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/220943
Change subject: sync with master
......................................................................
sync with master
Change-Id: I49ec50f938f4eb6e78c60a97620e665876da25f0
---
M MediaWikiKit/MediaWikiKit/MWKHistoryEntry.m
M MediaWikiKit/MediaWikiKit/MWKHistoryList.m
M MediaWikiKit/MediaWikiKit/MWKUserDataStore.m
M MediaWikiKit/MediaWikiKitTests/MWKImageListTests.m
M Wikipedia.xcodeproj/project.pbxproj
M Wikipedia/Base.lproj/Main_iPhone.storyboard
M Wikipedia/Global.h
M Wikipedia/View Controllers/WebView/WebViewController.m
D Wikipedia/af.lproj/Main_iPhone.strings
M Wikipedia/ast.lproj/Localizable.strings
D Wikipedia/azb.lproj/Main_iPhone.strings
D Wikipedia/bgn.lproj/Main_iPhone.strings
D Wikipedia/da.lproj/Main_iPhone.strings
D Wikipedia/de.lproj/Main_iPhone.strings
D Wikipedia/diq.lproj/Main_iPhone.strings
D Wikipedia/fr.lproj/Main_iPhone.strings
D Wikipedia/gu.lproj/Main_iPhone.strings
D Wikipedia/id.lproj/Main_iPhone.strings
D Wikipedia/is.lproj/Main_iPhone.strings
D Wikipedia/ka.lproj/Main_iPhone.strings
D Wikipedia/kk-cyrl.lproj/Main_iPhone.strings
D Wikipedia/km.lproj/Main_iPhone.strings
D Wikipedia/ksh.lproj/Main_iPhone.strings
D Wikipedia/ku-latn.lproj/Main_iPhone.strings
D Wikipedia/lb.lproj/Main_iPhone.strings
D Wikipedia/mt.lproj/Main_iPhone.strings
D Wikipedia/my.lproj/Main_iPhone.strings
D Wikipedia/nb.lproj/Main_iPhone.strings
D Wikipedia/om.lproj/Main_iPhone.strings
D Wikipedia/pa.lproj/Main_iPhone.strings
D Wikipedia/pl.lproj/Main_iPhone.strings
M Wikipedia/qqq.lproj/Localizable.strings
D Wikipedia/qqq.lproj/Main_iPhone.strings
D Wikipedia/ro.lproj/Main_iPhone.strings
D Wikipedia/sa.lproj/Main_iPhone.strings
D Wikipedia/sah.lproj/Main_iPhone.strings
D Wikipedia/sw.lproj/Main_iPhone.strings
D Wikipedia/tg-cyrl.lproj/Main_iPhone.strings
D Wikipedia/uz.lproj/Main_iPhone.strings
D Wikipedia/yi.lproj/Main_iPhone.strings
D Wikipedia/zh-hans.lproj/Main_iPhone.strings
M WikipediaUnitTests/MWKSection+WMFSharingTests.m
M WikipediaUnitTests/MWKSectionListTests.m
M WikipediaUnitTests/Utilities/MWKImage+AssociationTestUtils.m
M WikipediaUnitTests/WMFImageInfoControllerTests.m
45 files changed, 25 insertions(+), 826 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia
refs/changes/43/220943/1
diff --git a/MediaWikiKit/MediaWikiKit/MWKHistoryEntry.m
b/MediaWikiKit/MediaWikiKit/MWKHistoryEntry.m
index ca4ef1c..46b148c 100644
--- a/MediaWikiKit/MediaWikiKit/MWKHistoryEntry.m
+++ b/MediaWikiKit/MediaWikiKit/MWKHistoryEntry.m
@@ -74,7 +74,7 @@
[dict wmf_maybeSetObject:[self iso8601DateString:self.date]
forKey:@"date"];
[dict wmf_maybeSetObject:[MWKHistoryEntry
stringForDiscoveryMethod:self.discoveryMethod] forKey:@"discoveryMethod"];
[dict wmf_maybeSetObject:@(self.scrollPosition) forKey:@"scrollPosition"];
-
+
return [NSDictionary dictionaryWithDictionary:dict];
}
diff --git a/MediaWikiKit/MediaWikiKit/MWKHistoryList.m
b/MediaWikiKit/MediaWikiKit/MWKHistoryList.m
index 10eed39..b0e718b 100644
--- a/MediaWikiKit/MediaWikiKit/MWKHistoryList.m
+++ b/MediaWikiKit/MediaWikiKit/MWKHistoryList.m
@@ -107,15 +107,9 @@
#pragma mark - History Update
-<<<<<<< HEAD (db4b8e For easier debugging of 5.0, show "Read" button.)
- (AnyPromise*)addPageToHistoryWithTitle:(MWKTitle*)title
discoveryMethod:(MWKHistoryDiscoveryMethod)discoveryMethod {
- if (title == nil) {
+ if (title.text.length == 0) {
return [AnyPromise promiseWithValue:[NSError
wmf_errorWithType:WMFErrorTypeStringMissingParameter userInfo:nil]];
-=======
-- (void)addEntry:(MWKHistoryEntry*)entry {
- if ([entry.title.text length] == 0) {
- return;
->>>>>>> BRANCH (ffd60b version bump)
}
MWKHistoryEntry* entry = [[MWKHistoryEntry alloc] initWithTitle:title
discoveryMethod:discoveryMethod];
@@ -125,7 +119,7 @@
}
- (AnyPromise*)addEntry:(MWKHistoryEntry*)entry {
- if (entry.title == nil) {
+ if ([entry.title.text length] == 0) {
return [AnyPromise promiseWithValue:[NSError
wmf_errorWithType:WMFErrorTypeStringMissingParameter userInfo:nil]];
}
@@ -142,15 +136,9 @@
return [AnyPromise promiseWithValue:entry];
}
-<<<<<<< HEAD (db4b8e For easier debugging of 5.0, show "Read" button.)
- (AnyPromise*)savePageScrollPosition:(CGFloat)scrollposition
toPageInHistoryWithTitle:(MWKTitle*)title {
- if (title == nil) {
+ if ([title.text length] == 0) {
return [AnyPromise promiseWithValue:[NSError
wmf_errorWithType:WMFErrorTypeStringMissingParameter userInfo:nil]];
-=======
-- (void)removeEntry:(MWKHistoryEntry*)entry {
- if ([entry.title.text length] == 0) {
- return;
->>>>>>> BRANCH (ffd60b version bump)
}
MWKHistoryEntry* entry = [self entryForTitle:title];
@@ -164,7 +152,7 @@
}
- (AnyPromise*)removePageFromHistoryWithTitle:(MWKTitle*)title {
- if (title == nil) {
+ if (title.text.length == 0) {
return [AnyPromise promiseWithValue:[NSError
wmf_errorWithType:WMFErrorTypeStringMissingParameter userInfo:nil]];
}
diff --git a/MediaWikiKit/MediaWikiKit/MWKUserDataStore.m
b/MediaWikiKit/MediaWikiKit/MWKUserDataStore.m
index 3b10c59..a9203da 100644
--- a/MediaWikiKit/MediaWikiKit/MWKUserDataStore.m
+++ b/MediaWikiKit/MediaWikiKit/MWKUserDataStore.m
@@ -43,26 +43,8 @@
return _recentSearchList;
}
-<<<<<<< HEAD (db4b8e For easier debugging of 5.0, show "Read" button.)
- (AnyPromise*)save {
return PMKWhen(@[[self.historyList save], [self.savedPageList save],
[self.recentSearchList save]]);
-=======
-- (void)updateHistory:(MWKTitle*)title
discoveryMethod:(MWKHistoryDiscoveryMethod)discoveryMethod {
- if (title.text == nil) {
- //Weird, should be text here… if not we can't go forward. Just not
going to update the history.
- return;
- }
- MWKHistoryEntry* entry = [self.historyList entryForTitle:title];
- if (entry) {
- entry.discoveryMethod = discoveryMethod;
- entry.date = [NSDate date];
- // Retain saved scroll position
- } else {
- entry = [[MWKHistoryEntry alloc] initWithTitle:title
discoveryMethod:discoveryMethod];
- }
- [self.historyList addEntry:entry];
- [self save];
->>>>>>> BRANCH (ffd60b version bump)
}
- (AnyPromise*)reset {
diff --git a/MediaWikiKit/MediaWikiKitTests/MWKImageListTests.m
b/MediaWikiKit/MediaWikiKitTests/MWKImageListTests.m
index b9253dc..21637f1 100644
--- a/MediaWikiKit/MediaWikiKitTests/MWKImageListTests.m
+++ b/MediaWikiKit/MediaWikiKitTests/MWKImageListTests.m
@@ -42,7 +42,7 @@
MWKDataStore* tmpDataStore = [[MWKDataStore alloc]
initWithBasePath:self.tempDataStoreDir];
// create article w/ mock section to prevent crashing due to image import
side effects
- MWKTitle* title = [[MWKSite siteWithCurrentLocale] titleWithString:@"foo"];
+ MWKTitle* title = [[MWKSite siteWithCurrentLocale]
titleWithString:@"foo"];
MWKArticle* article = [[MWKArticle alloc] initWithTitle:title
dataStore:tmpDataStore];
[article.sections setSections:[NSMutableArray
arrayWithObject:mock([MWKSection class])]];
diff --git a/Wikipedia.xcodeproj/project.pbxproj
b/Wikipedia.xcodeproj/project.pbxproj
index 30ba063..4fb2b1a 100644
--- a/Wikipedia.xcodeproj/project.pbxproj
+++ b/Wikipedia.xcodeproj/project.pbxproj
@@ -268,11 +268,8 @@
BC69C3141AB0C1FF0090B039 /* WMFImageInfoController.m in Sources
*/ = {isa = PBXBuildFile; fileRef = BC69C3131AB0C1FF0090B039 /*
WMFImageInfoController.m */; };
BC6BF4001B19213600362968 /* XCTestCase+WMFLocaleTesting.m in
Sources */ = {isa = PBXBuildFile; fileRef = BC6BF3FE1B19209900362968 /*
XCTestCase+WMFLocaleTesting.m */; };
BC7DFCD61AA4E5FE000035C3 /* WMFImageURLParsing.m in Sources */
= {isa = PBXBuildFile; fileRef = BC7DFCD51AA4E5FE000035C3 /*
WMFImageURLParsing.m */; };
-<<<<<<< HEAD (db4b8e For easier debugging of 5.0, show "Read" button.)
BC7E4A441B33812700EECD8B /* LanguagesViewController.storyboard
in Resources */ = {isa = PBXBuildFile; fileRef = BC7E4A431B33812700EECD8B /*
LanguagesViewController.storyboard */; };
-=======
BC7E4A521B34B53E00EECD8B /* MWKLanguageLinkControllerTests.m in
Sources */ = {isa = PBXBuildFile; fileRef = BC7E4A511B34B53E00EECD8B /*
MWKLanguageLinkControllerTests.m */; };
->>>>>>> BRANCH (ffd60b version bump)
BC86B9361A92966B00B4C039 /*
AFHTTPRequestOperationManager+UniqueRequests.m in Sources */ = {isa =
PBXBuildFile; fileRef = BC86B9351A92966B00B4C039 /*
AFHTTPRequestOperationManager+UniqueRequests.m */; };
BC86B93D1A929CC500B4C039 /*
UICollectionViewFlowLayout+NSCopying.m in Sources */ = {isa = PBXBuildFile;
fileRef = BC86B93C1A929CC500B4C039 /* UICollectionViewFlowLayout+NSCopying.m
*/; };
BC86B9401A929D7900B4C039 /*
UICollectionViewFlowLayout+WMFItemSizeThatFits.m in Sources */ = {isa =
PBXBuildFile; fileRef = BC86B93F1A929D7900B4C039 /*
UICollectionViewFlowLayout+WMFItemSizeThatFits.m */; };
@@ -850,13 +847,10 @@
BC7DFCCB1AA4BA8A000035C3 /* WMFCodingStyle.h */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WMFCodingStyle.h;
sourceTree = "<group>"; };
BC7DFCD41AA4E5FE000035C3 /* WMFImageURLParsing.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
WMFImageURLParsing.h; sourceTree = "<group>"; };
BC7DFCD51AA4E5FE000035C3 /* WMFImageURLParsing.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= WMFImageURLParsing.m; sourceTree = "<group>"; };
-<<<<<<< HEAD (db4b8e For easier debugging of 5.0, show "Read" button.)
BC7E4A431B33812700EECD8B /* LanguagesViewController.storyboard
*/ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
file.storyboard; path = LanguagesViewController.storyboard; sourceTree =
"<group>"; };
BC7E4A491B34A26A00EECD8B /* WMFLogging.h */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WMFLogging.h;
sourceTree = "<group>"; };
-=======
BC7E4A501B34B4B900EECD8B /* MWKLanguageLinkController_Private.h
*/ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.c.h; path = MWKLanguageLinkController_Private.h; sourceTree =
"<group>"; };
BC7E4A511B34B53E00EECD8B /* MWKLanguageLinkControllerTests.m */
= {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.c.objc; path = MWKLanguageLinkControllerTests.m; sourceTree =
"<group>"; };
->>>>>>> BRANCH (ffd60b version bump)
BC86B9341A92966B00B4C039 /*
AFHTTPRequestOperationManager+UniqueRequests.h */ = {isa = PBXFileReference;
fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
"AFHTTPRequestOperationManager+UniqueRequests.h"; sourceTree = "<group>"; };
BC86B9351A92966B00B4C039 /*
AFHTTPRequestOperationManager+UniqueRequests.m */ = {isa = PBXFileReference;
fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path =
"AFHTTPRequestOperationManager+UniqueRequests.m"; sourceTree = "<group>"; };
BC86B93B1A929CC500B4C039 /*
UICollectionViewFlowLayout+NSCopying.h */ = {isa = PBXFileReference;
fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
"UICollectionViewFlowLayout+NSCopying.h"; sourceTree = "<group>"; };
@@ -1955,7 +1949,6 @@
name = "Image Gallery";
sourceTree = "<group>";
};
-<<<<<<< HEAD (db4b8e For easier debugging of 5.0, show "Read" button.)
0E2B06F71B2D126700EA2F53 /* Data Sources */ = {
isa = PBXGroup;
children = (
@@ -2098,8 +2091,6 @@
path = "UI-V5";
sourceTree = "<group>";
};
-=======
->>>>>>> BRANCH (ffd60b version bump)
0EFB0EF91B31EE2D00D05C08 /* LegacyCoreData */ = {
isa = PBXGroup;
children = (
@@ -2564,11 +2555,7 @@
D4BC22B3181E9E6300CAC673 /* empty.png */,
D4991447181D51DE00E6073C /* AppDelegate.h */,
D4991448181D51DE00E6073C /* AppDelegate.m */,
-<<<<<<< HEAD (db4b8e For easier debugging of 5.0, show "Read" button.)
0E94AFE81B2096D5000BC5EA /* UI-V5 */,
-=======
- D499144A181D51DE00E6073C /*
Main_iPhone.storyboard */,
->>>>>>> BRANCH (ffd60b version bump)
D46CD8C018A1AC4F0042959E /* InfoPlist.strings
*/,
D46CD8C218A1AC4F0042959E /* Localizable.strings
*/,
BCF012321AD2FA38008D3675 /* assets */,
@@ -3599,11 +3586,7 @@
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
);
-<<<<<<< HEAD (db4b8e For easier debugging of 5.0, show "Read" button.)
- GCC_PREFIX_HEADER =
"wikipedia/Wikipedia-Prefix.pch";
-=======
GCC_PREFIX_HEADER =
"WikipediaUnitTests/Supporting Files/WikipediaUnitTests-Prefix.pch";
->>>>>>> BRANCH (ffd60b version bump)
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
INFOPLIST_FILE = "WikipediaUnitTests/Supporting
Files/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 8.1;
@@ -3711,11 +3694,7 @@
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
);
-<<<<<<< HEAD (db4b8e For easier debugging of 5.0, show "Read" button.)
- GCC_PREFIX_HEADER =
"wikipedia/Wikipedia-Prefix.pch";
-=======
GCC_PREFIX_HEADER =
"WikipediaUnitTests/Supporting Files/WikipediaUnitTests-Prefix.pch";
->>>>>>> BRANCH (ffd60b version bump)
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
INFOPLIST_FILE = "WikipediaUnitTests/Supporting
Files/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 8.1;
@@ -3738,11 +3717,7 @@
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
);
-<<<<<<< HEAD (db4b8e For easier debugging of 5.0, show "Read" button.)
- GCC_PREFIX_HEADER =
"wikipedia/Wikipedia-Prefix.pch";
-=======
GCC_PREFIX_HEADER =
"WikipediaUnitTests/Supporting Files/WikipediaUnitTests-Prefix.pch";
->>>>>>> BRANCH (ffd60b version bump)
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
"FB_REFERENCE_IMAGE_DIR=\"$(PROJECT_DIR)/WikipediaUnitTests/Reference
Snapshots\"",
@@ -3772,11 +3747,7 @@
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
);
-<<<<<<< HEAD (db4b8e For easier debugging of 5.0, show "Read" button.)
- GCC_PREFIX_HEADER =
"wikipedia/Wikipedia-Prefix.pch";
-=======
GCC_PREFIX_HEADER =
"WikipediaUnitTests/Supporting Files/WikipediaUnitTests-Prefix.pch";
->>>>>>> BRANCH (ffd60b version bump)
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
INFOPLIST_FILE = "WikipediaUnitTests/Supporting
Files/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 8.1;
diff --git a/Wikipedia/Base.lproj/Main_iPhone.storyboard
b/Wikipedia/Base.lproj/Main_iPhone.storyboard
index 1f6f715..8c34dfc 100644
--- a/Wikipedia/Base.lproj/Main_iPhone.storyboard
+++ b/Wikipedia/Base.lproj/Main_iPhone.storyboard
@@ -1,5 +1,3 @@
-<<<<<<< HEAD (db4b8e For easier debugging of 5.0, show "Read" button.)
-=======
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB"
version="3.0" toolsVersion="7706" systemVersion="14D136"
targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES"
initialViewController="1qV-3k-dN1">
<dependencies>
@@ -2173,4 +2171,3 @@
<segue reference="ZQB-DP-tFv"/>
</inferredMetricsTieBreakers>
</document>
->>>>>>> BRANCH (ffd60b version bump)
diff --git a/Wikipedia/Global.h b/Wikipedia/Global.h
index ec457be..2e475f2 100644
--- a/Wikipedia/Global.h
+++ b/Wikipedia/Global.h
@@ -2,34 +2,16 @@
#ifndef Wikipedia_Global_h
#define Wikipedia_Global_h
-<<<<<<< HEAD (db4b8e For easier debugging of 5.0, show "Read" button.)
+#import <BlocksKit/BlocksKit.h>
+#import <libextobjc/EXTScope.h>
+
#import "WMFLogging.h"
#import "WMFGCDHelpers.h"
-#import <BlocksKit/BlocksKit.h>
#import "NSError+WMFExtensions.h"
-
-#import <libextobjc/EXTScope.h>
+#import "NSObjectUtilities.h"
#import "MediaWikiKit.h"
#import "WMFArticlePresenter.h"
-=======
-#ifndef DEBUG
-#define NSLog(...) {}
-#else
-#define NSLog(FORMAT, ...) fprintf(stderr, "\n%s Line %d\n\t%s\n",
__PRETTY_FUNCTION__, __LINE__, [[NSString stringWithFormat:FORMAT, ##
__VA_ARGS__] UTF8String]);
-#endif // end DEBUG
-
-#import "WMFGCDHelpers.h"
-#import "NSObjectUtilities.h"
-
-#import "RootViewController.h"
-#import "CenterNavController.h"
-
-#define ROOT ((RootViewController*)[UIApplication
sharedApplication].delegate.window.rootViewController)
-#define NAV ROOT.centerNavController
-
-#import "MediaWikiKit.h"
->>>>>>> BRANCH (ffd60b version bump)
static inline NSString* localizedStringForKeyFallingBackOnEnglish(NSString*
key){
NSString* outStr = NSLocalizedString(key, nil);
diff --git a/Wikipedia/View Controllers/WebView/WebViewController.m
b/Wikipedia/View Controllers/WebView/WebViewController.m
index d05c260..022f746 100644
--- a/Wikipedia/View Controllers/WebView/WebViewController.m
+++ b/Wikipedia/View Controllers/WebView/WebViewController.m
@@ -1168,16 +1168,7 @@
return;
}
-<<<<<<< HEAD (db4b8e For easier debugging of 5.0, show "Read" button.)
[self.session.userDataStore.historyList
savePageScrollPosition:self.webView.scrollView.contentOffset.y
toPageInHistoryWithTitle:self.session.currentArticle.title];
-=======
- MWKHistoryEntry* entry = [self.session.userDataStore.historyList
entryForTitle:self.session.currentArticle.title];
- if ([entry.title.text length] > 0) {
- entry.scrollPosition =
self.webView.scrollView.contentOffset.y;
- self.session.userDataStore.historyList.dirty = YES; // hack to
force
- [self.session.userDataStore save];
- }
->>>>>>> BRANCH (ffd60b version bump)
}
#pragma mark Web view html content live location retrieval
@@ -1383,18 +1374,16 @@
- (void)navigateToPage:(MWKTitle*)title
discoveryMethod:(MWKHistoryDiscoveryMethod)discoveryMethod {
-
NSParameterAssert(title);
- if([title.text length] == 0){
-
+ if ([title.text length] == 0) {
[self showAlert:MWLocalizedString(@"article-unable-to-load-article",
nil) type:ALERT_TYPE_TOP duration:2];
return;
}
-
+
NSString* cleanTitle = title.text;
NSParameterAssert(cleanTitle.length);
[self hideKeyboard];
-
+
self.jumpToFragment = title.fragment;
if (discoveryMethod != MWKHistoryDiscoveryMethodBackForward &&
discoveryMethod != MWKHistoryDiscoveryMethodReloadFromNetwork &&
discoveryMethod != MWKHistoryDiscoveryMethodReloadFromCache) {
@@ -1403,10 +1392,6 @@
[self retrieveArticleForPageTitle:title
discoveryMethod:discoveryMethod];
-<<<<<<< HEAD (db4b8e For easier debugging of 5.0, show "Read" button.)
-=======
-
->>>>>>> BRANCH (ffd60b version bump)
}
- (void)reloadCurrentArticleFromNetwork {
@@ -1436,10 +1421,8 @@
- (void)retrieveArticleForPageTitle:(MWKTitle*)pageTitle
discoveryMethod:(MWKHistoryDiscoveryMethod)discoveryMethod
{
-
NSParameterAssert(pageTitle);
- if([pageTitle.text length] == 0){
-
+ if ([pageTitle.text length] == 0) {
[self showAlert:MWLocalizedString(@"article-unable-to-load-article",
nil) type:ALERT_TYPE_TOP duration:2];
return;
}
@@ -1525,13 +1508,12 @@
self.isFetchingArticle = NO;
- if([article.title.text length] == 0){
-
+ if ([article.title.text length] == 0) {
[self
showAlert:MWLocalizedString(@"article-unable-to-load-article", nil)
type:ALERT_TYPE_TOP duration:2];
return;
}
-
+
// Update the toc and web view.
[self displayArticle:article.title];
@@ -1722,9 +1704,8 @@
#pragma mark Display article from data store
- (void)displayArticle:(MWKTitle*)title {
-
NSParameterAssert(title.text);
- if([title.text length] == 0){
+ if ([title.text length] == 0) {
return;
}
diff --git a/Wikipedia/af.lproj/Main_iPhone.strings
b/Wikipedia/af.lproj/Main_iPhone.strings
deleted file mode 100644
index 9ec446c..0000000
--- a/Wikipedia/af.lproj/Main_iPhone.strings
+++ /dev/null
@@ -1,23 +0,0 @@
-// Messages for Afrikaans (Afrikaans)
-// Exported from translatewiki.net
-// Author: Arnobarnard
-
-"21c-U6-yfo.normalTitle" = "Vertoon ander captcha";
-"5cT-2Y-0Ie.placeholder" = "Gebruikernaam";
-"GiD-Rj-wb7.text" = "Gestoorde bladsye is wonderlik. Dink aan hulle as
boekmerke wat u kan lees selfs as u aflyn is.";
-"LfM-01-aCF.text" = "Voorskou";
-"P6J-IE-CiO.text" = "Slaan oor";
-"PCr-0J-fBj.placeholder" = "Wagwoord";
-"UgH-77-lyp.placeholder" = "Her-tik wagwoord";
-"W1c-wQ-1pa.text" = "Nog geen gestoorde bladsye.";
-"Wff-o9-AdH.text" = "Meld aan";
-"aUp-0e-F6i.text" = "Geen onlangse bladsye hier.";
-"c3c-PU-Exz.text" = "Skep gebruiker";
-"gPg-cg-Yjy.placeholder" = "Vul in CAPTCHA teks vanaf beeld hierdbo";
-"heA-3K-nhS.text" = "Het u reeds 'n rekening? Meld aan";
-"huU-kO-aYI.text" = "U het moontlik hulle almal geskrap. Volgende keer as u na
'n bladsy gaan kan u terugkom daarby van hier af.";
-"jiW-Cg-oL3.text" = "Skep Gebruiker";
-"kVb-lx-d6C.placeholder" = "Wagwoord";
-"mAk-1N-jPC.placeholder" = "Gebruikernaam";
-"rKI-nq-3p7.placeholder" = "E-posadres (opsioneel)";
-"wkl-j8-wLX.text" = "Skep gebruiker";
diff --git a/Wikipedia/ast.lproj/Localizable.strings
b/Wikipedia/ast.lproj/Localizable.strings
index 8dfd2ab..ce006b7 100644
--- a/Wikipedia/ast.lproj/Localizable.strings
+++ b/Wikipedia/ast.lproj/Localizable.strings
@@ -260,14 +260,12 @@
"image-gallery-fetch-image-info-error-title" = "Nun pudieron descargase les
imaxes";
"image-gallery-fetch-image-info-error-message" = "Nun pudieron descargase les
imaxes pa esti artículu. Por favor, refresca l'artículu ya inténtalo otra
vuelta.";
"image-gallery-fetch-image-info-error-ok" = "Aceutar";
-<<<<<<< HEAD (db4b8e For easier debugging of 5.0, show "Read" button.)
"captcha-reload" = "Amosar otru «captcha»";
"saved-pages-description" = "Les páxines guardaes son prestoses enforma.
Piensa nelles como marcadores que pues lleer anque nun tengas conexón.";
"saved-pages-none" = "Inda nun hai páxines guardaes.";
"history-none" = "Equí nun hai páxines recientes.";
"captcha-prompt" = "Escribi'l testu CAPTCHA de la imaxe d'arriba";
"history-description" = "Probablemente desaniciástiles toes. La siguiente vez
que vaigas a una páxina pues volver a ella dende equí.";
-=======
"hockeyapp-alert-question" = "¿Quedríes unviar un informe de fallu a $1 para
que Wikimedia pueda revisalu?";
"hockeyapp-alert-question-with-response-field" = "¿Quedríes unviar un informe
de fallu a $1 para que Wikimedia pueda revisalu? Por favor, describe qué pasó
cuando asocedió'l fallu:";
"hockeyapp-alert-title" = "Sentímoslo, l'aplicación falló la última vez";
@@ -277,4 +275,3 @@
"hockeyapp-alert-privacy" = "Intimidá de $1";
"page-issues" = "Problemes de la páxina";
"page-similar-titles" = "Páxines asemeyaes";
->>>>>>> BRANCH (ffd60b version bump)
diff --git a/Wikipedia/azb.lproj/Main_iPhone.strings
b/Wikipedia/azb.lproj/Main_iPhone.strings
deleted file mode 100644
index ce4da2c..0000000
--- a/Wikipedia/azb.lproj/Main_iPhone.strings
+++ /dev/null
@@ -1,21 +0,0 @@
-// Messages for South Azerbaijani (تۆرکجه)
-// Exported from translatewiki.net
-// Author: Arjanizary
-
-"21c-U6-yfo.normalTitle" = "آیری کپچا کودو گؤستر";
-"5cT-2Y-0Ie.placeholder" = "ایستیفادهچی آدی";
-"LfM-01-aCF.text" = "اؤنگؤستریش";
-"P6J-IE-CiO.text" = "آتلا";
-"PCr-0J-fBj.placeholder" = "رمز";
-"UgH-77-lyp.placeholder" = "رمزی یئنیدن یازین";
-"W1c-wQ-1pa.text" = "هله ساخلانمیش صحیفه یوخدو.";
-"Wff-o9-AdH.text" = "گیریش";
-"aUp-0e-F6i.text" = "بوردا یئنی صحیفه یوخدو.";
-"c3c-PU-Exz.text" = "حساب یارات";
-"gPg-cg-Yjy.placeholder" = "کپچا کودون متنینی یوخاریداکی عکسدن یازینیز";
-"heA-3K-nhS.text" = "اؤنجهدن حسابینیز وارمی؟ گیرینیز";
-"jiW-Cg-oL3.text" = "حساب یارات";
-"kVb-lx-d6C.placeholder" = "رمز";
-"mAk-1N-jPC.placeholder" = "ایستیفادهچی آدی";
-"rKI-nq-3p7.placeholder" = "ایمئیل آدرئسی (ایستگه باغلی)";
-"wkl-j8-wLX.text" = "حساب یارات";
diff --git a/Wikipedia/bgn.lproj/Main_iPhone.strings
b/Wikipedia/bgn.lproj/Main_iPhone.strings
deleted file mode 100644
index e4a5819..0000000
--- a/Wikipedia/bgn.lproj/Main_iPhone.strings
+++ /dev/null
@@ -1,18 +0,0 @@
-// Messages for Western Balochi (بلوچی رخشانی)
-// Exported from translatewiki.net
-// Author: Baloch Afghanistan
-
-"5cT-2Y-0Ie.placeholder" = "کار زوروکی نام";
-"LfM-01-aCF.text" = "دیم دیست";
-"P6J-IE-CiO.text" = "ایشتین";
-"PCr-0J-fBj.placeholder" = "چیهر گال یا پاسورد";
-"UgH-77-lyp.placeholder" = "چیهر گال یا پاسوردا پدا بنویسیئت";
-"W1c-wQ-1pa.text" = "تا انون هیچ تاکدیمئ ذخیره نه بوته.";
-"Wff-o9-AdH.text" = "داخل بوتین";
-"c3c-PU-Exz.text" = "کار زوروکین حسابئ جوڑ کورتین";
-"heA-3K-nhS.text" = "شما کار زوروکین حسابئ داریت ؟ لوگین بئیت.";
-"jiW-Cg-oL3.text" = "کار زوروکین حسابئ جوڑ کورتین";
-"kVb-lx-d6C.placeholder" = "چیهر گال یا پاسورد";
-"mAk-1N-jPC.placeholder" = "کار زوروکی نام";
-"rKI-nq-3p7.placeholder" = "ایمیل ادرس (اختیاری)";
-"wkl-j8-wLX.text" = "کار زوروکین حسابئ جوڑ کورتین";
diff --git a/Wikipedia/da.lproj/Main_iPhone.strings
b/Wikipedia/da.lproj/Main_iPhone.strings
deleted file mode 100644
index c68a06c..0000000
--- a/Wikipedia/da.lproj/Main_iPhone.strings
+++ /dev/null
@@ -1,29 +0,0 @@
-<<<<<<< HEAD (db4b8e For easier debugging of 5.0, show "Read" button.)
-=======
-// Messages for Danish (dansk)
-// Exported from translatewiki.net
-// Author: Anders Feder
-// Author: Christian List
-// Author: Gorbi
-
-"21c-U6-yfo.normalTitle" = "Vis en anden captcha";
-"5cT-2Y-0Ie.placeholder" = "Brugernavn";
-"GiD-Rj-wb7.text" = "Gemte sider er ret seje. Tænk på dem som bogmærker, som
du kan læse, selv når du er offline.";
-"LfM-01-aCF.text" = "Forhåndsvis";
-"P6J-IE-CiO.text" = "Spring over";
-"PCr-0J-fBj.placeholder" = "Adgangskode";
-"UgH-77-lyp.placeholder" = "Gentag adgangskode";
-"W1c-wQ-1pa.text" = "Ingen gemte sider endnu.";
-"Wff-o9-AdH.text" = "Log på";
-"aUp-0e-F6i.text" = "Ingen nye sider her.";
-"c3c-PU-Exz.text" = "Opret konto";
-"gPg-cg-Yjy.placeholder" = "Indtast CAPTCHA teksten fra billedet ovenfor";
-"heA-3K-nhS.text" = "Har du allerede en konto? Log på";
-"huU-kO-aYI.text" = "Du har sikkert slettet dem alle. Næste gang du går til en
side, kan du komme tilbage til den her.";
-"jiW-Cg-oL3.text" = "Opret konto";
-"kVb-lx-d6C.placeholder" = "Adgangskode";
-"mAk-1N-jPC.placeholder" = "Brugernavn";
-"rKI-nq-3p7.placeholder" = "E-mailadresse (valgfri)";
-"wVn-n7-pdy.text" = "Sprognavn:";
-"wkl-j8-wLX.text" = "Opret konto";
->>>>>>> BRANCH (ffd60b version bump)
diff --git a/Wikipedia/de.lproj/Main_iPhone.strings
b/Wikipedia/de.lproj/Main_iPhone.strings
deleted file mode 100644
index dc66f9b..0000000
--- a/Wikipedia/de.lproj/Main_iPhone.strings
+++ /dev/null
@@ -1,28 +0,0 @@
-<<<<<<< HEAD (db4b8e For easier debugging of 5.0, show "Read" button.)
-=======
-// Messages for German (Deutsch)
-// Exported from translatewiki.net
-// Author: Metalhead64
-
-"21c-U6-yfo.normalTitle" = "Ein anderes Captcha anzeigen";
-"5cT-2Y-0Ie.placeholder" = "Benutzername";
-"GiD-Rj-wb7.text" = "Gespeicherte Seiten sind ziemlich genial. Betrachte sie
als Lesezeichen, die du lesen kannst, auch wenn du offline bist.";
-"LfM-01-aCF.text" = "Vorschau";
-"P6J-IE-CiO.text" = "Überspringen";
-"PCr-0J-fBj.placeholder" = "Passwort";
-"UgH-77-lyp.placeholder" = "Passwort wiederholen";
-"W1c-wQ-1pa.text" = "Noch keine gespeicherten Seiten.";
-"Wff-o9-AdH.text" = "Anmelden";
-"aUp-0e-F6i.text" = "Hier gibt es keine letzten Seiten.";
-"c3c-PU-Exz.text" = "Benutzerkonto erstellen";
-"gPg-cg-Yjy.placeholder" = "CAPTCHA-Text von dem oben stehenden Bild eingeben";
-"heA-3K-nhS.text" = "Hast du bereits ein Benutzerkonto? Anmelden";
-"huU-kO-aYI.text" = "Du hast vermutlich alle Seiten gelöscht. Das nächste Mal,
wenn du eine Seite besuchst, kannst du von hier auf sie zurückgehen.";
-"ib6-Zk-jUw.text" = "Lokalisierter Artikeltitel";
-"jiW-Cg-oL3.text" = "Benutzerkonto erstellen";
-"kVb-lx-d6C.placeholder" = "Passwort";
-"mAk-1N-jPC.placeholder" = "Benutzername";
-"rKI-nq-3p7.placeholder" = "E-Mail-Adresse (optional)";
-"wVn-n7-pdy.text" = "Sprachenname";
-"wkl-j8-wLX.text" = "Benutzerkonto erstellen";
->>>>>>> BRANCH (ffd60b version bump)
diff --git a/Wikipedia/diq.lproj/Main_iPhone.strings
b/Wikipedia/diq.lproj/Main_iPhone.strings
deleted file mode 100644
index 13c4b3f..0000000
--- a/Wikipedia/diq.lproj/Main_iPhone.strings
+++ /dev/null
@@ -1,12 +0,0 @@
-// Messages for Zazaki (Zazaki)
-// Exported from translatewiki.net
-// Author: Marmase
-// Author: Mirzali
-
-"5cT-2Y-0Ie.placeholder" = "Nameyê karberi";
-"LfM-01-aCF.text" = "Verqayt";
-"PCr-0J-fBj.placeholder" = "Parola";
-"Wff-o9-AdH.text" = "Cı kewe";
-"kVb-lx-d6C.placeholder" = "Parola";
-"mAk-1N-jPC.placeholder" = "Nameyê karberi";
-"wkl-j8-wLX.text" = "Hesab vıraze";
diff --git a/Wikipedia/fr.lproj/Main_iPhone.strings
b/Wikipedia/fr.lproj/Main_iPhone.strings
deleted file mode 100644
index aa3e098..0000000
--- a/Wikipedia/fr.lproj/Main_iPhone.strings
+++ /dev/null
@@ -1,29 +0,0 @@
-<<<<<<< HEAD (db4b8e For easier debugging of 5.0, show "Read" button.)
-=======
-// Messages for French (français)
-// Exported from translatewiki.net
-// Author: Gomoko
-// Author: Hydros
-
-"21c-U6-yfo.normalTitle" = "Afficher un autre captcha";
-"5cT-2Y-0Ie.placeholder" = "Nom de l’utilisateur";
-"GiD-Rj-wb7.text" = "Les pages enregistrées sont assez impressionnantes.
Voyez-les comme des favoris que vous pouvez lire même en étant déconnecté.";
-"LfM-01-aCF.text" = "Aperçu";
-"P6J-IE-CiO.text" = "Passer";
-"PCr-0J-fBj.placeholder" = "Mot de passe";
-"UgH-77-lyp.placeholder" = "Saisir de nouveau le mot de passe";
-"W1c-wQ-1pa.text" = "Encore aucune page enregistrée.";
-"Wff-o9-AdH.text" = "Connexion";
-"aUp-0e-F6i.text" = "Aucune page récente ici.";
-"c3c-PU-Exz.text" = "Créer un compte";
-"gPg-cg-Yjy.placeholder" = "Entrer le texte du CAPTCHA dans l’image ci-dessus";
-"heA-3K-nhS.text" = "Vous avez déjà un compte ? Connectez-vous";
-"huU-kO-aYI.text" = "Vous les avez probablement toutes supprimées. La
prochaine fois que vous irez sur une page, vous pourrez y retourner depuis
ici.";
-"ib6-Zk-jUw.text" = "Titre d’article localisé";
-"jiW-Cg-oL3.text" = "Créer un compte";
-"kVb-lx-d6C.placeholder" = "Mot de passe";
-"mAk-1N-jPC.placeholder" = "Nom d’utilisateur";
-"rKI-nq-3p7.placeholder" = "Adresse électronique (facultative)";
-"wVn-n7-pdy.text" = "Nom de langue";
-"wkl-j8-wLX.text" = "Créer un compte";
->>>>>>> BRANCH (ffd60b version bump)
diff --git a/Wikipedia/gu.lproj/Main_iPhone.strings
b/Wikipedia/gu.lproj/Main_iPhone.strings
deleted file mode 100644
index cdd796f..0000000
--- a/Wikipedia/gu.lproj/Main_iPhone.strings
+++ /dev/null
@@ -1,16 +0,0 @@
-// Messages for Gujarati (ગુજરાતી)
-// Exported from translatewiki.net
-// Author: NehalDaveND
-
-"5cT-2Y-0Ie.placeholder" = "સભ્ય નામ";
-"LfM-01-aCF.text" = "પૂર્વદર્શન";
-"P6J-IE-CiO.text" = "કુદાવો";
-"PCr-0J-fBj.placeholder" = "પાસવર્ડ";
-"UgH-77-lyp.placeholder" = "ગુપ્ત સંજ્ઞા (પાસવર્ડ) ફરી લખો:";
-"Wff-o9-AdH.text" = "પ્રવેશ કરો";
-"c3c-PU-Exz.text" = "ખાતું બનાવો";
-"jiW-Cg-oL3.text" = "ખાતું બનાવો";
-"kVb-lx-d6C.placeholder" = "ગુપ્ત સંજ્ઞા";
-"mAk-1N-jPC.placeholder" = "સભ્ય નામ";
-"rKI-nq-3p7.placeholder" = "ઇમેલ સરનામું (વૈકલ્પિક)";
-"wkl-j8-wLX.text" = "ખાતું બનાવો";
diff --git a/Wikipedia/id.lproj/Main_iPhone.strings
b/Wikipedia/id.lproj/Main_iPhone.strings
deleted file mode 100644
index f7edb42..0000000
--- a/Wikipedia/id.lproj/Main_iPhone.strings
+++ /dev/null
@@ -1,26 +0,0 @@
-// Messages for Indonesian (Bahasa Indonesia)
-// Exported from translatewiki.net
-// Author: Arifin.wijaya
-// Author: Bennylin
-// Author: Iwan Novirion
-// Author: Relly Komaruzaman
-
-"21c-U6-yfo.normalTitle" = "Tampilkan captcha yang lain";
-"5cT-2Y-0Ie.placeholder" = " Nama pengguna";
-"GiD-Rj-wb7.text" = "Halaman yang disimpan cukup mengagumkan. Menganggap
mereka sebagai penanda yang dapat Anda baca bahkan ketika Anda sedang luring.";
-"LfM-01-aCF.text" = "Pratayang";
-"P6J-IE-CiO.text" = "Lewati";
-"PCr-0J-fBj.placeholder" = "Kata sandi";
-"UgH-77-lyp.placeholder" = "Ulangi kata sandi";
-"W1c-wQ-1pa.text" = "Tidak ada halaman yang disimpan.";
-"Wff-o9-AdH.text" = "Masuk log";
-"aUp-0e-F6i.text" = "Tidak ada halaman terbaru di sini.";
-"c3c-PU-Exz.text" = "Buat Akun";
-"gPg-cg-Yjy.placeholder" = "Masukkan teks CAPTCHA dari gambar di atas";
-"heA-3K-nhS.text" = "Sudah memiliki akun? Silakan masuk log";
-"huU-kO-aYI.text" = "Anda mungkin telah menghapusnya. Lain kali Anda pergi ke
halaman Anda dapat kembali ke sana dari sini.";
-"jiW-Cg-oL3.text" = "Buat Akun";
-"kVb-lx-d6C.placeholder" = "Kata sandi";
-"mAk-1N-jPC.placeholder" = "Nama pengguna";
-"rKI-nq-3p7.placeholder" = "Alamat surel/email (sebaiknya diisi)";
-"wkl-j8-wLX.text" = "Buat akun baru";
diff --git a/Wikipedia/is.lproj/Main_iPhone.strings
b/Wikipedia/is.lproj/Main_iPhone.strings
deleted file mode 100644
index 7598714..0000000
--- a/Wikipedia/is.lproj/Main_iPhone.strings
+++ /dev/null
@@ -1,23 +0,0 @@
-// Messages for Icelandic (íslenska)
-// Exported from translatewiki.net
-// Author: Maxí
-
-"21c-U6-yfo.normalTitle" = "Sýna aðra CAPTCHA-mynd";
-"5cT-2Y-0Ie.placeholder" = "Notandanafn";
-"GiD-Rj-wb7.text" = "Vistaðar síður eru frekar gagnlegar. Hugsaðu um þær sem
bókamerki sem þú getur lesið jafnvel án nettengingar.";
-"LfM-01-aCF.text" = "Forskoða";
-"P6J-IE-CiO.text" = "Sleppa";
-"PCr-0J-fBj.placeholder" = "Lykilorð";
-"UgH-77-lyp.placeholder" = "Staðfestu lykilorð";
-"W1c-wQ-1pa.text" = "Engar vistaðar síður ennþá.";
-"Wff-o9-AdH.text" = "Innskráning";
-"aUp-0e-F6i.text" = "Engar nýlegar síður hér.";
-"c3c-PU-Exz.text" = "Nýskráning";
-"gPg-cg-Yjy.placeholder" = "Sláðu inn textann af CAPTCHA-myndinni fyrir ofan";
-"heA-3K-nhS.text" = "Ertu með aðgang? Skráðu þig inn";
-"huU-kO-aYI.text" = "Þú hefur líklega eytt öllum þeirra. Í næsta skiptið sem
þú ferð á síðu geturðu komist aftur á hana héðan.";
-"jiW-Cg-oL3.text" = "Nýskráning";
-"kVb-lx-d6C.placeholder" = "Lykilorð";
-"mAk-1N-jPC.placeholder" = "Notandanafn";
-"rKI-nq-3p7.placeholder" = "Netfang (valfrjálst)";
-"wkl-j8-wLX.text" = "Nýskrá";
diff --git a/Wikipedia/ka.lproj/Main_iPhone.strings
b/Wikipedia/ka.lproj/Main_iPhone.strings
deleted file mode 100644
index 6a9a6c3..0000000
--- a/Wikipedia/ka.lproj/Main_iPhone.strings
+++ /dev/null
@@ -1,23 +0,0 @@
-// Messages for Georgian (ქართული)
-// Exported from translatewiki.net
-// Author: MIKHEIL
-
-"21c-U6-yfo.normalTitle" = "სხვა captcha-ს ჩვენება";
-"5cT-2Y-0Ie.placeholder" = "მომხმარებლის სახელი";
-"GiD-Rj-wb7.text" = "შენახული გვერდები ძალზე შთამბეჭდავია. მონიშნე ისინი
ფავორიტებად, რათა მათი წაკითხვა შეძლოთ ოფლაინ რეჟიმშიც.";
-"LfM-01-aCF.text" = "წინასწარ გადახედვა";
-"P6J-IE-CiO.text" = "გამოტოვება";
-"PCr-0J-fBj.placeholder" = "პაროლი";
-"UgH-77-lyp.placeholder" = "ხელმეორედ შეიყვანეთ პაროლი";
-"W1c-wQ-1pa.text" = "შენახული გვერდები არ არის!";
-"Wff-o9-AdH.text" = "შესვლა";
-"aUp-0e-F6i.text" = "ბოლო გვერდები ვერ მოიძებნა!";
-"c3c-PU-Exz.text" = "გახსენი ანგარიში";
-"gPg-cg-Yjy.placeholder" = "შეიყვანეთ CAPTCHA-ს ტექსტი სურათის ზემოდან.";
-"heA-3K-nhS.text" = "უკვე გაქვთ ანგარიში? გაიარეთ ავტორიზაცია";
-"huU-kO-aYI.text" = "სავარაუდოდ, თქვენ ყველა მათგანი წაშალეთ. შემდეგში, როცა
თქვენ გვერდზე გადახვალთ, მისი უკან დაბრუნება შეგეძლებათ აქედან.";
-"jiW-Cg-oL3.text" = "გახსენი ანგარიში";
-"kVb-lx-d6C.placeholder" = "პაროლი";
-"mAk-1N-jPC.placeholder" = "მომხმარებლის სახელი";
-"rKI-nq-3p7.placeholder" = "ელ. ფოსტის მისამართი (არასავალდებულო)";
-"wkl-j8-wLX.text" = "გახსენი ანგარიში";
diff --git a/Wikipedia/kk-cyrl.lproj/Main_iPhone.strings
b/Wikipedia/kk-cyrl.lproj/Main_iPhone.strings
deleted file mode 100644
index db7c091..0000000
--- a/Wikipedia/kk-cyrl.lproj/Main_iPhone.strings
+++ /dev/null
@@ -1,21 +0,0 @@
-// Messages for Kazakh (Cyrillic script) (қазақша (кирил))
-// Exported from translatewiki.net
-// Author: Arystanbek
-
-"21c-U6-yfo.normalTitle" = "Басқа кодты көрсет";
-"5cT-2Y-0Ie.placeholder" = "Қатысушы есімі";
-"LfM-01-aCF.text" = "Қарап шығу";
-"P6J-IE-CiO.text" = "Өткізіп жіберу";
-"PCr-0J-fBj.placeholder" = "Құпиясөз";
-"UgH-77-lyp.placeholder" = "Құпия сөзді қайта теріңіз:";
-"W1c-wQ-1pa.text" = "Әзірге беттерді сақталған жоқ.";
-"Wff-o9-AdH.text" = "Кіру";
-"aUp-0e-F6i.text" = "Мұнда жуықтағы беттер жоқ.";
-"c3c-PU-Exz.text" = "Тіркелу";
-"gPg-cg-Yjy.placeholder" = "Жоғарыдағы суреттен CAPTCHA мәтінін енгізіңіз";
-"heA-3K-nhS.text" = "Бұған дейін тіркеліп пе едіңіз? $1.";
-"jiW-Cg-oL3.text" = "Тіркелу";
-"kVb-lx-d6C.placeholder" = "Құпия сөз";
-"mAk-1N-jPC.placeholder" = "Қатысушы есімі";
-"rKI-nq-3p7.placeholder" = "Е-пошта мекенжайы (міндетті емес)";
-"wkl-j8-wLX.text" = "Тіркелу";
diff --git a/Wikipedia/km.lproj/Main_iPhone.strings
b/Wikipedia/km.lproj/Main_iPhone.strings
deleted file mode 100644
index dec8890..0000000
--- a/Wikipedia/km.lproj/Main_iPhone.strings
+++ /dev/null
@@ -1,23 +0,0 @@
-// Messages for Khmer (ភាសាខ្មែរ)
-// Exported from translatewiki.net
-// Author: គីមស៊្រុន
-
-"21c-U6-yfo.normalTitle" = "បង្ហាញ captcha មួយទៀត";
-"5cT-2Y-0Ie.placeholder" = "អត្តនាម";
-"GiD-Rj-wb7.text" = "ទំព័ររក្សាទុកជាមុខងារអស្ចារ្យមួយ។
អ្នកអាចចាត់ទុកវាជាការកត់ចំណាំ សម្រាប់អោយអ្នកអាចអានអត្ថបទពេលអ្នកនៅក្រៅបណ្ដាញ";
-"LfM-01-aCF.text" = "ការមើលមុន";
-"P6J-IE-CiO.text" = "រំលង";
-"PCr-0J-fBj.placeholder" = "ពាក្យសម្ងាត់";
-"UgH-77-lyp.placeholder" = "វាយពាក្យសម្ងាត់ម្តងទៀត";
-"W1c-wQ-1pa.text" = "មិនទាន់មានទំព័ររក្សាទុកទេ។";
-"Wff-o9-AdH.text" = "កត់ឈ្មោះចូល";
-"aUp-0e-F6i.text" = "គ្មានទំព័រថ្មីៗនៅទីនេះទេ។";
-"c3c-PU-Exz.text" = "បង្កើតគណនី";
-"gPg-cg-Yjy.placeholder" = "វាយបញ្ចូលឃ្លា CAPTCHA ពីរូបភាពខាងលើ";
-"heA-3K-nhS.text" = "តើអ្នកមានគណនីមួយរួចហើយឬ? សូមកត់ឈ្មោះចូល។";
-"huU-kO-aYI.text" = "អ្នកប្រហែលជាបានលុបវាចោលអស់ហើយ។
លើកក្រោយពេលអ្នកចូលមើលទំព័រមួយ អ្នកអាចត្រឡប់ទៅកាន់ទំព័រនោះពីទីនេះ។";
-"jiW-Cg-oL3.text" = "បង្កើតគណនី";
-"kVb-lx-d6C.placeholder" = "ពាក្យសម្ងាត់";
-"mAk-1N-jPC.placeholder" = "អត្តនាម";
-"rKI-nq-3p7.placeholder" = "អាសយដ្ឋានអ៊ីមែល (ដាក់ក៏បានមិនដាក់ក៏បាន)";
-"wkl-j8-wLX.text" = "បង្កើតគណនី";
diff --git a/Wikipedia/ksh.lproj/Main_iPhone.strings
b/Wikipedia/ksh.lproj/Main_iPhone.strings
deleted file mode 100644
index a9085d9..0000000
--- a/Wikipedia/ksh.lproj/Main_iPhone.strings
+++ /dev/null
@@ -1,24 +0,0 @@
-// Messages for Colognian (Ripoarisch)
-// Exported from translatewiki.net
-// Author: Purodha
-
-"21c-U6-yfo.normalTitle" = "En annder <span style=\"text-transform:uppercase\"
title=\"Jät zom Ennjävve, öm ze zeije, dadd ene Minsch vör em Kompjuhter
sez\">Kaptscha</span> aanzeije";
-"5cT-2Y-0Ie.placeholder" = "Metmaacher_Nahme";
-"GiD-Rj-wb7.text" = "Faßjehallde Sigge sin janz johd. Kannze lässe, sälvs wann
De kein Verbendong mem Näz häs, un wi op Lässezeische drop zohjriife.";
-"LfM-01-aCF.text" = "Vörschou";
-"P6J-IE-CiO.text" = "Övverjonn";
-"PCr-0J-fBj.placeholder" = "Paßwoot";
-"UgH-77-lyp.placeholder" = "Norr_ens dat Passwood";
-"W1c-wQ-1pa.text" = "Noch kein faßjegallde Sigge.";
-"Wff-o9-AdH.text" = "Enlogge";
-"aUp-0e-F6i.text" = "Noch kein köözlesche Sigge.";
-"c3c-PU-Exz.text" = "Ene Zohjang aanlähje";
-"gPg-cg-Yjy.placeholder" = "Jif dä <span style=\"text-transform:uppercase\"
title=\"Jät zom Ennjävve, öm ze zeije, dadd ene Minsch vör em Kompjuhter
sez\">Kaptscha</span>-Täx vun dämm Belld en.";
-"heA-3K-nhS.text" = "Do häs alld_ene Zohjang? Dann donn enlogge!";
-"huU-kO-aYI.text" = "Do hä se velleisch alle fott jeschmeße. Et nähkste Mohl
kanns De vun heh op se zeröck jonn.";
-"jiW-Cg-oL3.text" = "Ene Zohjang aanlähje";
-"kVb-lx-d6C.placeholder" = "Et Paßwoot";
-"mAk-1N-jPC.placeholder" = "Dä Metmaacher_Nahme";
-"rKI-nq-3p7.placeholder" = "De Adräß för de <i lang=\"en\">e-mail</i>, kann
fott blihve";
-"wVn-n7-pdy.text" = "Dä Nahme vun dä Schprohch";
-"wkl-j8-wLX.text" = "Ene neue Zohjang aanmälde";
diff --git a/Wikipedia/ku-latn.lproj/Main_iPhone.strings
b/Wikipedia/ku-latn.lproj/Main_iPhone.strings
deleted file mode 100644
index 3d76fce..0000000
--- a/Wikipedia/ku-latn.lproj/Main_iPhone.strings
+++ /dev/null
@@ -1,19 +0,0 @@
-// Messages for Kurdish (Latin script) (Kurdî (latînî))
-// Exported from translatewiki.net
-// Author: George Animal
-
-"5cT-2Y-0Ie.placeholder" = "Navê bikarhêner";
-"LfM-01-aCF.text" = "Pêşdîtin";
-"PCr-0J-fBj.placeholder" = "Şîfre";
-"UgH-77-lyp.placeholder" = "Şîfreyê dîsa binivîse";
-"W1c-wQ-1pa.text" = "Rûpelên ku hê nehatine tomarkirin.";
-"Wff-o9-AdH.text" = "Têkeve";
-"aUp-0e-F6i.text" = "Li vir rûpelên dawî tune ne.";
-"c3c-PU-Exz.text" = "Hesabekî çêke";
-"gPg-cg-Yjy.placeholder" = "Nivîsa CAPTCHAyê ji wêneyê jor binivîse";
-"heA-3K-nhS.text" = "Hesabê te heye? Têkeve";
-"jiW-Cg-oL3.text" = "Hesabekî çêke";
-"kVb-lx-d6C.placeholder" = "Şîfre";
-"mAk-1N-jPC.placeholder" = "Navê bikarhêner";
-"rKI-nq-3p7.placeholder" = "E-name";
-"wkl-j8-wLX.text" = "Hesabekî çêke";
diff --git a/Wikipedia/lb.lproj/Main_iPhone.strings
b/Wikipedia/lb.lproj/Main_iPhone.strings
deleted file mode 100644
index 4a80b75..0000000
--- a/Wikipedia/lb.lproj/Main_iPhone.strings
+++ /dev/null
@@ -1,28 +0,0 @@
-<<<<<<< HEAD (db4b8e For easier debugging of 5.0, show "Read" button.)
-=======
-// Messages for Luxembourgish (Lëtzebuergesch)
-// Exported from translatewiki.net
-// Author: Robby
-
-"21c-U6-yfo.normalTitle" = "En anere Captcha weisen";
-"5cT-2Y-0Ie.placeholder" = "Benotzernumm";
-"GiD-Rj-wb7.text" = "Gespäichert Säite si flott. Denkt dru fir ze als
Lieszeechen ze benotzen déi Dir liese kënnt wann Dir offline sidd.";
-"LfM-01-aCF.text" = "Kucken ouni ofzespäicheren";
-"P6J-IE-CiO.text" = "Iwwersprangen";
-"PCr-0J-fBj.placeholder" = "Passwuert";
-"UgH-77-lyp.placeholder" = "Passwuert widderhuelen";
-"W1c-wQ-1pa.text" = "Nach keng gespäichert Säiten.";
-"Wff-o9-AdH.text" = "Aloggen";
-"aUp-0e-F6i.text" = "Keng rezent Säiten hei.";
-"c3c-PU-Exz.text" = "Benotzerkont uleeën";
-"gPg-cg-Yjy.placeholder" = "Gitt de Captcha-Text vum Bild heidriwwer an";
-"heA-3K-nhS.text" = "Hutt Dir schonn e Benotzerkont? Loggt Iech an";
-"huU-kO-aYI.text" = "Dir hutt se wahrscheinlech all geläscht. Wann Dir déi
nächste Kéier op eng Säit gitt da kënnt Dir vun hei aus op déi Säit zréckgoen.";
-"ib6-Zk-jUw.text" = "Lokaliséierten Titel vum Artikel";
-"jiW-Cg-oL3.text" = "Benotzerkont uleeën";
-"kVb-lx-d6C.placeholder" = "Passwuert";
-"mAk-1N-jPC.placeholder" = "Benotzernumm";
-"rKI-nq-3p7.placeholder" = "E-Mail-Adress (fakultativ)";
-"wVn-n7-pdy.text" = "Numm vun der Sprooch";
-"wkl-j8-wLX.text" = "Benotzerkont uleeën";
->>>>>>> BRANCH (ffd60b version bump)
diff --git a/Wikipedia/mt.lproj/Main_iPhone.strings
b/Wikipedia/mt.lproj/Main_iPhone.strings
deleted file mode 100644
index 15bcab9..0000000
--- a/Wikipedia/mt.lproj/Main_iPhone.strings
+++ /dev/null
@@ -1,20 +0,0 @@
-// Messages for Maltese (Malti)
-// Exported from translatewiki.net
-// Author: Chrisportelli
-
-"21c-U6-yfo.normalTitle" = "Uri captcha oħra";
-"5cT-2Y-0Ie.placeholder" = "Isem l-utent";
-"P6J-IE-CiO.text" = "Aqbeż";
-"PCr-0J-fBj.placeholder" = "Password";
-"UgH-77-lyp.placeholder" = "Erġa' ikteb il-password:";
-"Wff-o9-AdH.text" = "Idħol";
-"aUp-0e-F6i.text" = "L-ebda paġna riċenti hawnhekk.";
-"c3c-PU-Exz.text" = "Oħloq kont";
-"gPg-cg-Yjy.placeholder" = "Daħħal it-test tal-CAPTCHA mill-istampa t'hawn
fuq";
-"heA-3K-nhS.text" = "Diġà għandek kont? Idħol";
-"huU-kO-aYI.text" = "Probabbilment ħassarthom kollha. Id-darba li jmiss li
tmur fuq paġna, tista' tmur lura fiha minn hawnhekk.";
-"jiW-Cg-oL3.text" = "Irreġistra";
-"kVb-lx-d6C.placeholder" = "Password";
-"mAk-1N-jPC.placeholder" = "Isem l-utent";
-"rKI-nq-3p7.placeholder" = "Indirizz elettroniku (fakultattiv)";
-"wkl-j8-wLX.text" = "Oħloq kont";
diff --git a/Wikipedia/my.lproj/Main_iPhone.strings
b/Wikipedia/my.lproj/Main_iPhone.strings
deleted file mode 100644
index ee8279c..0000000
--- a/Wikipedia/my.lproj/Main_iPhone.strings
+++ /dev/null
@@ -1,14 +0,0 @@
-// Messages for Burmese (မြန်မာဘာသာ)
-// Exported from translatewiki.net
-// Author: ZawMin
-
-"aUp-0e-F6i.text" = "ဒီမှာ မည်သည့် လတ်တလော စာမျက်နှာမှ မရှိပါ";
-"c3c-PU-Exz.text" = "အကောင့် ဖန်တီးရန်";
-"gPg-cg-Yjy.placeholder" = "အထက်ပါ ပုံရိပ်မှ CAPTCHA စာသားအား ဖြည့်စွက်ပါ";
-"heA-3K-nhS.text" = "အကောင့် ရှိပြီးသားလား? မှတ်တမ်းဖြင့် ဝင်ပါ";
-"huU-kO-aYI.text" = "အားလုံးကို သင် ဖျက်ပစ်လိုက်တာ ဖြစ်နိုင်သည်။ နောင်တွင်
သင်သွားရောက်သည့် စာမျက်နှာအား ဤနေရာတွင် ပြန်ရယူနိုင်ပါသည်။";
-"jiW-Cg-oL3.text" = "အကောင့် ဖန်းတီးရန်";
-"kVb-lx-d6C.placeholder" = "စကားဝှက်";
-"mAk-1N-jPC.placeholder" = "အသုံးပြုသူအမည်";
-"rKI-nq-3p7.placeholder" = "အီးမေးလ် လိပ်စာ (ဖြည့်လိုက)";
-"wkl-j8-wLX.text" = "အကောင့် ဖန်တီးရန်";
diff --git a/Wikipedia/nb.lproj/Main_iPhone.strings
b/Wikipedia/nb.lproj/Main_iPhone.strings
deleted file mode 100644
index eb9d35a..0000000
--- a/Wikipedia/nb.lproj/Main_iPhone.strings
+++ /dev/null
@@ -1,23 +0,0 @@
-// Messages for Norwegian Bokmål (norsk bokmål)
-// Exported from translatewiki.net
-// Author: Danmichaelo
-
-"21c-U6-yfo.normalTitle" = "Vis en annen CAPTCHA";
-"5cT-2Y-0Ie.placeholder" = "Brukernavn";
-"GiD-Rj-wb7.text" = "Lagrede sider er veldig praktisk. Tenk på dem som
bokmerker som du også kan lese når du er offline.";
-"LfM-01-aCF.text" = "Forhåndsvis";
-"P6J-IE-CiO.text" = "Hopp over";
-"PCr-0J-fBj.placeholder" = "Passord";
-"UgH-77-lyp.placeholder" = "Gjenta passord";
-"W1c-wQ-1pa.text" = "Ingen lagrede sider enda.";
-"Wff-o9-AdH.text" = "Logg inn";
-"aUp-0e-F6i.text" = "Ingen besøkte sider.";
-"c3c-PU-Exz.text" = "Opprett konto";
-"gPg-cg-Yjy.placeholder" = "Skriv inn CAPTCHA-teksten fra bildet ovenfor";
-"heA-3K-nhS.text" = "Har du en konto allerede? Logg inn";
-"huU-kO-aYI.text" = "Du har kanskje tømt loggen. Neste gang du besøker en side
kan du finne den igjen her etterpå.";
-"jiW-Cg-oL3.text" = "Opprett konto";
-"kVb-lx-d6C.placeholder" = "Passord";
-"mAk-1N-jPC.placeholder" = "Brukernavn";
-"rKI-nq-3p7.placeholder" = "E-postadresse (valgfritt)";
-"wkl-j8-wLX.text" = "Opprett konto";
diff --git a/Wikipedia/om.lproj/Main_iPhone.strings
b/Wikipedia/om.lproj/Main_iPhone.strings
deleted file mode 100644
index 03aa428..0000000
--- a/Wikipedia/om.lproj/Main_iPhone.strings
+++ /dev/null
@@ -1,17 +0,0 @@
-// Messages for Oromo (Oromoo)
-// Exported from translatewiki.net
-// Author: Tumsaa
-
-"5cT-2Y-0Ie.placeholder" = "Maqaa fayyadamaa";
-"LfM-01-aCF.text" = "Durargii";
-"P6J-IE-CiO.text" = "Bira darbi";
-"PCr-0J-fBj.placeholder" = "Iggitaa";
-"UgH-77-lyp.placeholder" = "Iggita irra-deebi'i";
-"W1c-wQ-1pa.text" = "Fuulli amma yoonaa olkaawwame hinjiru.";
-"Wff-o9-AdH.text" = "Seeni";
-"c3c-PU-Exz.text" = "Eenyummeessa uumi";
-"heA-3K-nhS.text" = "Duraan eenyummeessa qabdaa? Seeni";
-"jiW-Cg-oL3.text" = "Eenyummeessa uumi";
-"kVb-lx-d6C.placeholder" = "Iggitaa";
-"mAk-1N-jPC.placeholder" = "Maqaa fayyadamaa";
-"wkl-j8-wLX.text" = "Eenyummeessa uumi";
diff --git a/Wikipedia/pa.lproj/Main_iPhone.strings
b/Wikipedia/pa.lproj/Main_iPhone.strings
deleted file mode 100644
index 5284aac..0000000
--- a/Wikipedia/pa.lproj/Main_iPhone.strings
+++ /dev/null
@@ -1,23 +0,0 @@
-// Messages for Punjabi (ਪੰਜਾਬੀ)
-// Exported from translatewiki.net
-// Author: Babanwalia
-
-"21c-U6-yfo.normalTitle" = "ਕੋਈ ਹੋਰ ਕੈਪਚਾ ਵਿਖਾਉ";
-"5cT-2Y-0Ie.placeholder" = "ਵਰਤੋਂਕਾਰ ਨਾਂ";
-"GiD-Rj-wb7.text" = "ਸਾਂਭੇ ਹੋਏ ਸਫ਼ੇ ਡਾਢੇ ਵਧੀਆ ਹੁੰਦੇ ਹਨ। ਉਹਨਾਂ ਨੂੰ ਅਜਿਹੇ
ਨਿਸ਼ਾਨੀ-ਕਾਗਜ਼ ਸਮਝੋ ਜਿਹਨਾਂ ਨੂੰ ਤੁਸੀਂ ਲੀਹੋਂ ਲਹਿ ਕੇ ਵੀ ਪੜ੍ਹ ਸਕਦੇ ਹੋ।";
-"LfM-01-aCF.text" = "ਝਾਤ";
-"P6J-IE-CiO.text" = "ਛੱਡੋ";
-"PCr-0J-fBj.placeholder" = "ਪਛਾਣ-ਸ਼ਬਦ";
-"UgH-77-lyp.placeholder" = "ਪਛਾਣ-ਸ਼ਬਦ ਮੁੜ ਲਿਖੋ:";
-"W1c-wQ-1pa.text" = "ਅਜੇ ਕੋਈ ਸਾਂਭੇ ਹੋਏ ਸਫ਼ੇ ਨਹੀਂ।";
-"Wff-o9-AdH.text" = "ਦਾਖ਼ਲਾ";
-"aUp-0e-F6i.text" = "ਇੱਥੇ ਕੋਈ ਹਾਲੀਆ ਵਰਕੇ ਨਹੀਂ।";
-"c3c-PU-Exz.text" = "ਖਾਤਾ ਬਣਾਉ";
-"gPg-cg-Yjy.placeholder" = "ਉਤਲੀ ਤਸਵੀਰ ਤੋਂ ਕੈਪਚਾ ਲਿਖਤ ਭਰੋ";
-"heA-3K-nhS.text" = "ਪਹਿਲੋਂ ਹੀ ਖਾਤਾ ਹੈ? ਦਾਖ਼ਲ ਹੋਵੋ";
-"huU-kO-aYI.text" = "ਤੁਸੀਂ ਸ਼ਾਇਦ ਇਹ ਸਾਰੇ ਮਿਟਾ ਦਿੱਤੇ ਹਨ। ਅਗਲੀ ਵਾਰ ਜਦ ਤੁਸੀਂ ਕਿਸੇ
ਸਫ਼ੇ 'ਤੇ ਜਾਉਂ ਤਾਂ ਤੁਸੀਂ ਇੱਥੋਂ ਉਹਦੇ ਤੱਕ ਪਰਤ ਸਕਦੇ ਹੋ।";
-"jiW-Cg-oL3.text" = "ਖਾਤਾ ਬਣਾਉ";
-"kVb-lx-d6C.placeholder" = "ਪਛਾਣ-ਸ਼ਬਦ";
-"mAk-1N-jPC.placeholder" = "ਵਰਤੋਂਕਾਰ ਨਾਂ";
-"rKI-nq-3p7.placeholder" = "ਈਮੇਲ ਪਤਾ (ਚੋਣਵਾਂ)";
-"wkl-j8-wLX.text" = "ਖਾਤਾ ਬਣਾਉ";
diff --git a/Wikipedia/pl.lproj/Main_iPhone.strings
b/Wikipedia/pl.lproj/Main_iPhone.strings
deleted file mode 100644
index 1401397..0000000
--- a/Wikipedia/pl.lproj/Main_iPhone.strings
+++ /dev/null
@@ -1,31 +0,0 @@
-<<<<<<< HEAD (db4b8e For easier debugging of 5.0, show "Read" button.)
-=======
-// Messages for Polish (polski)
-// Exported from translatewiki.net
-// Author: Alchemik
-// Author: Chrumps
-// Author: Jacenty359
-// Author: Pio387
-// Author: Tar Lócesilion
-
-"21c-U6-yfo.normalTitle" = "Pokaż inny tekst CAPTCHA";
-"5cT-2Y-0Ie.placeholder" = "Nazwa użytkownika";
-"GiD-Rj-wb7.text" = "Zapisane strony są całkiem fajne. Pomyśl o nich jako o
zakładkach, które można przeczytać nawet wtedy, gdy jesteś w trybie offline.";
-"LfM-01-aCF.text" = "Podgląd";
-"P6J-IE-CiO.text" = "Pomiń";
-"PCr-0J-fBj.placeholder" = "Hasło";
-"UgH-77-lyp.placeholder" = "Wpisz ponownie hasło";
-"W1c-wQ-1pa.text" = "Nie zapisano jeszcze żadnych stron.";
-"Wff-o9-AdH.text" = "Zaloguj się";
-"aUp-0e-F6i.text" = "Brak ostatnich zmian stron.";
-"c3c-PU-Exz.text" = "Utwórz konto";
-"gPg-cg-Yjy.placeholder" = "Wpisz tekst CAPTCHA z obrazka powyżej";
-"heA-3K-nhS.text" = "Masz już konto? Zaloguj się";
-"huU-kO-aYI.text" = "Prawdopodobnie usunąłeś je wszystkie. Następnym razem,
gdy wejdziesz na stronę, możesz powrócić do niej stąd.";
-"jiW-Cg-oL3.text" = "Utwórz konto";
-"kVb-lx-d6C.placeholder" = "Hasło";
-"mAk-1N-jPC.placeholder" = "Nazwa użytkownika";
-"rKI-nq-3p7.placeholder" = "Adres e-mail (opcjonalnie)";
-"wVn-n7-pdy.text" = "Nazwa języka";
-"wkl-j8-wLX.text" = "Utwórz konto";
->>>>>>> BRANCH (ffd60b version bump)
diff --git a/Wikipedia/qqq.lproj/Localizable.strings
b/Wikipedia/qqq.lproj/Localizable.strings
index 587d4a1..809567c 100644
--- a/Wikipedia/qqq.lproj/Localizable.strings
+++ b/Wikipedia/qqq.lproj/Localizable.strings
@@ -282,7 +282,6 @@
"hockeyapp-alert-privacy" = "Alert dialog button text for HockeyApp privacy
policy. $1 will be replaced programmatically with the constant string
'HockeyApp'";
"page-issues" = "Label for the button that shows the \"Page issues\" dialog,
where information about the imperfections of the current page is provided (by
displaying the warning/cleanup templates).\n{{Identical|Page issue}}";
"page-similar-titles" = "Label for button that shows a list of similar titles
(disambiguation) for the current page";
-<<<<<<< HEAD (db4b8e For easier debugging of 5.0, show "Read" button.)
"languages-title" = "Title for language picker";
"captcha-reload" = "Title for button used to request another CAPTCHA to solve";
"captcha-prompt" = "Text prompting user to solve a CAPTCHA";
@@ -290,5 +289,3 @@
"saved-pages-none" = "Title indicating there are no saved pages";
"history-description" = "Description of history of browsed pages";
"history-none" = "Title indicating no pages were found in history";
-=======
->>>>>>> BRANCH (ffd60b version bump)
diff --git a/Wikipedia/qqq.lproj/Main_iPhone.strings
b/Wikipedia/qqq.lproj/Main_iPhone.strings
deleted file mode 100644
index a04f467..0000000
--- a/Wikipedia/qqq.lproj/Main_iPhone.strings
+++ /dev/null
@@ -1,33 +0,0 @@
-<<<<<<< HEAD (db4b8e For easier debugging of 5.0, show "Read" button.)
-=======
-// Messages for Message documentation (Message documentation)
-// Exported from translatewiki.net
-// Author: Liuxinyu970226
-// Author: Robby
-
-"21c-U6-yfo.normalTitle" = "Label for button on captcha screen to fetch and
show another captcha image";
-"5cT-2Y-0Ie.placeholder" = "Label on login screen\n{{Identical|Username}}";
-"GiD-Rj-wb7.text" = "Explanatory text shown on saved pages list when no saved
pages are present.";
-"LfM-01-aCF.text" = "Button text for 'Preview' button on edit
screen\n{{Identical|Preview}}";
-"P6J-IE-CiO.text" = "Button text for 'Skip' button on onboarding screen that
offers to log in or sign up\n{{Identical|Skip}}";
-"PCr-0J-fBj.placeholder" = "Placeholder label text for password field on
create-account screen\n{{Identical|Password}}";
-"UgH-77-lyp.placeholder" = "Placeholder label text for second password field
on create-account screen";
-"W1c-wQ-1pa.text" = "Label text shown on saved pages list when there are no
saved pages.";
-"Wff-o9-AdH.text" = "Button text for 'Log in' button\n{{Identical|Log in}}";
-"XkB-Xo-Xq0.text" = "Unused; do not translate\n{{Identical|Label}}";
-"aCV-ih-PXn.text" = "Unused; do not translate";
-"aUp-0e-F6i.text" = "Label text shown on 'recent pages' list when there are no
recent pages.";
-"c3c-PU-Exz.text" = "Button to Create Account on the onboarding
screen\n{{Identical|Create account}}";
-"cbH-8H-z54.text" = "Unused; do not translate\n{{Identical|Label}}";
-"gPg-cg-Yjy.placeholder" = "Placeholder for input text on captcha input
screen";
-"heA-3K-nhS.text" = "Button label on onboarding screen offering to log in
instead of creating account";
-"huU-kO-aYI.text" = "Explanatory text shown on recent pages list when there
are no recent pages";
-"ib6-Zk-jUw.text" = "MISSING DESCRIPTION; DO NOT COMMIT FILE YET";
-"jiW-Cg-oL3.text" = "Button label to create account\n{{Identical|Create
account}}";
-"kVb-lx-d6C.placeholder" = "Placeholder label for login password
field\n{{Identical|Password}}";
-"mAk-1N-jPC.placeholder" = "Placeholder label for login username
field\n{{Identical|Username}}";
-"nI1-bn-0Ii.text" = "placeholder text; do not translate\n{{Identical|Label}}";
-"rKI-nq-3p7.placeholder" = "Placeholder text for email field on create account
form";
-"wVn-n7-pdy.text" = "MISSING DESCRIPTION; DO NOT COMMIT FILE YET";
-"wkl-j8-wLX.text" = "Button label to go to Create Account form from Login
form\n{{Identical|Create account}}";
->>>>>>> BRANCH (ffd60b version bump)
diff --git a/Wikipedia/ro.lproj/Main_iPhone.strings
b/Wikipedia/ro.lproj/Main_iPhone.strings
deleted file mode 100644
index ad02fb7..0000000
--- a/Wikipedia/ro.lproj/Main_iPhone.strings
+++ /dev/null
@@ -1,27 +0,0 @@
-<<<<<<< HEAD (db4b8e For easier debugging of 5.0, show "Read" button.)
-=======
-// Messages for Romanian (română)
-// Exported from translatewiki.net
-// Author: Minisarm
-
-"21c-U6-yfo.normalTitle" = "Arată alt text captcha";
-"5cT-2Y-0Ie.placeholder" = "Nume de utilizator";
-"GiD-Rj-wb7.text" = "Paginile salvate sunt minunate. Gândiți-vă la ele ca la
niște semne de carte care vă permit să citiți chiar și atunci când sunteți
off-line.";
-"LfM-01-aCF.text" = "Previzualizare";
-"P6J-IE-CiO.text" = "Omite";
-"PCr-0J-fBj.placeholder" = "Parolă";
-"UgH-77-lyp.placeholder" = "Reintroduceți parola";
-"W1c-wQ-1pa.text" = "Nicio pagină salvată încă.";
-"Wff-o9-AdH.text" = "Autentificare";
-"aUp-0e-F6i.text" = "Nicio pagină recentă aici.";
-"c3c-PU-Exz.text" = "Creare cont";
-"gPg-cg-Yjy.placeholder" = "Introduceți textul CAPTCHA din imaginea de mai
sus";
-"heA-3K-nhS.text" = "Aveți deja un cont? Autentificați-vă";
-"huU-kO-aYI.text" = "Probabil că le-ați șters pe toate. Data viitoare când
doriți să accesați o pagină, puteți reveni la ea pornind de aici.";
-"jiW-Cg-oL3.text" = "Creare cont";
-"kVb-lx-d6C.placeholder" = "Parolă";
-"mAk-1N-jPC.placeholder" = "Nume de utilizator";
-"rKI-nq-3p7.placeholder" = "Adresă de e-mail (opțională)";
-"wVn-n7-pdy.text" = "Numele limbii";
-"wkl-j8-wLX.text" = "Creare cont";
->>>>>>> BRANCH (ffd60b version bump)
diff --git a/Wikipedia/sa.lproj/Main_iPhone.strings
b/Wikipedia/sa.lproj/Main_iPhone.strings
deleted file mode 100644
index c5618bc..0000000
--- a/Wikipedia/sa.lproj/Main_iPhone.strings
+++ /dev/null
@@ -1,23 +0,0 @@
-// Messages for Sanskrit (संस्कृतम्)
-// Exported from translatewiki.net
-// Author: NehalDaveND
-
-"21c-U6-yfo.normalTitle" = "अन्यत् संभेपूस्वसाट्यूप प्रदर्शयतु";
-"5cT-2Y-0Ie.placeholder" = "योजकनाम";
-"GiD-Rj-wb7.text" = "संरक्षितानि पृष्ठानि अतिललितानि, उत्तमानि च सन्ति ।
पृष्ठस्मारकत्वेन (Bookmark) पृष्ठानि संरक्ष्य भवान्/भवती वियुक्ततया अपि तानि
पठितुं शक्नोति ।";
-"LfM-01-aCF.text" = "प्राग्दृश्यम्";
-"P6J-IE-CiO.text" = "प्लवनम्";
-"PCr-0J-fBj.placeholder" = "कूटशब्दः";
-"UgH-77-lyp.placeholder" = "कूटशब्दः पुनः लिख्यताम्";
-"W1c-wQ-1pa.text" = "पृष्ठानि इतोऽपि न रक्षितानि ।";
-"Wff-o9-AdH.text" = "प्रविश्यताम्";
-"aUp-0e-F6i.text" = "अत्र नवीनपृष्ठानि न सन्ति ।";
-"c3c-PU-Exz.text" = "सदस्यता प्राप्यताम्";
-"gPg-cg-Yjy.placeholder" = "उक्तचित्रात् संभेपूस्वसाट्यूप-पाठं लिखतु";
-"heA-3K-nhS.text" = "पूर्वमेव लेखा अस्ति किं ? प्रविश्यताम्";
-"huU-kO-aYI.text" = "कदाचित् तानि सर्वाणि भवता/भवत्या अपाकृतानि । द्वितीयवारं
यदा भवान्/भवती तत् पृष्ठं गच्छति, तदा इतः तत् पुनः प्राप्स्यति ।";
-"jiW-Cg-oL3.text" = "सदस्यता प्राप्यताम्";
-"kVb-lx-d6C.placeholder" = "कूटशब्दः";
-"mAk-1N-jPC.placeholder" = "योजकनाम";
-"rKI-nq-3p7.placeholder" = "वि-पत्रसङ्केतः (ऐच्छिकः)";
-"wkl-j8-wLX.text" = "सदस्यता प्राप्यताम्";
diff --git a/Wikipedia/sah.lproj/Main_iPhone.strings
b/Wikipedia/sah.lproj/Main_iPhone.strings
deleted file mode 100644
index 0e8a499..0000000
--- a/Wikipedia/sah.lproj/Main_iPhone.strings
+++ /dev/null
@@ -1,23 +0,0 @@
-// Messages for Sakha (саха тыла)
-// Exported from translatewiki.net
-// Author: Krivoshapkina
-
-"21c-U6-yfo.normalTitle" = "Атын куоду көрдөр";
-"5cT-2Y-0Ie.placeholder" = "Кыттааччы аата";
-"GiD-Rj-wb7.text" = "Көмпүүтэргэр харайыллыбыт сирэй үчүгэйэ диэн - хаһан
баҕарар ааҕыахха сөп, интэриниэккэ киирбэккэ даҕаны.";
-"LfM-01-aCF.text" = "Холоон көрүү";
-"P6J-IE-CiO.text" = "Аһар";
-"PCr-0J-fBj.placeholder" = "Аһарык";
-"UgH-77-lyp.placeholder" = "Аһарыккын хат суруй";
-"W1c-wQ-1pa.text" = "Хараллыбыт сирэй суох эбит.";
-"Wff-o9-AdH.text" = "Киир";
-"aUp-0e-F6i.text" = "Соторутааҕыта көрүллүбүт сирэй суох эбит.";
-"c3c-PU-Exz.text" = "Бэлиэтэнии";
-"gPg-cg-Yjy.placeholder" = "Ойууттан тиэкиһи суруйан ыл";
-"heA-3K-nhS.text" = "Бэлиэтэммитиҥ дуо? Киир";
-"huU-kO-aYI.text" = "Арааһа барытын соппуккун быһыылаах. Аныгыскыга, ханнык
эрэ сирэйгэ киирэ сылдьыбыт буоллаххына, ону мантан буолуоххун сөп буолуо.";
-"jiW-Cg-oL3.text" = "Бэлиэтэнии";
-"kVb-lx-d6C.placeholder" = "Аһарык";
-"mAk-1N-jPC.placeholder" = "Кыттааччы аата";
-"rKI-nq-3p7.placeholder" = "Email аадырыс (булгуччута суох)";
-"wkl-j8-wLX.text" = "Бэлиэтэнии";
diff --git a/Wikipedia/sw.lproj/Main_iPhone.strings
b/Wikipedia/sw.lproj/Main_iPhone.strings
deleted file mode 100644
index c7dabfa..0000000
--- a/Wikipedia/sw.lproj/Main_iPhone.strings
+++ /dev/null
@@ -1,23 +0,0 @@
-// Messages for Swahili (Kiswahili)
-// Exported from translatewiki.net
-// Author: Kwisha
-
-"21c-U6-yfo.normalTitle" = "Onyesha captcha nyingine";
-"5cT-2Y-0Ie.placeholder" = "Jina la mtumiaji";
-"GiD-Rj-wb7.text" = "Kurasa zilizohifadhiwa ni nzuri sana. Zifikirie kama
alamisho ambazo unaweza kusoma wakati hauko mtandaoni.";
-"LfM-01-aCF.text" = "Onyesha hakikisho";
-"P6J-IE-CiO.text" = "Ruka";
-"PCr-0J-fBj.placeholder" = "Neno la siri";
-"UgH-77-lyp.placeholder" = "Andika tena neno la siri";
-"W1c-wQ-1pa.text" = "Hakuna kurasa zilizohifadhiwa.";
-"Wff-o9-AdH.text" = "Ingia";
-"aUp-0e-F6i.text" = "Hakuna kurasa za hivi karibuni hapa.";
-"c3c-PU-Exz.text" = "Unda akaunti";
-"gPg-cg-Yjy.placeholder" = "Ingiza maandiko ya CAPTCHA kutoka kwa picha hapa
juu";
-"heA-3K-nhS.text" = "Uko na akaunti tayari? Ingia";
-"huU-kO-aYI.text" = "Huenda ikawa ulifuta zote. Wakati ujao ukienda kwenye
ukurasa unaweza kurudi kutoka hapa.";
-"jiW-Cg-oL3.text" = "Unda akaunti";
-"kVb-lx-d6C.placeholder" = "Neno la siri";
-"mAk-1N-jPC.placeholder" = "Jina la mtumiaji";
-"rKI-nq-3p7.placeholder" = "Anwani ya barua pepe (si lazima)";
-"wkl-j8-wLX.text" = "Unda akaunti";
diff --git a/Wikipedia/tg-cyrl.lproj/Main_iPhone.strings
b/Wikipedia/tg-cyrl.lproj/Main_iPhone.strings
deleted file mode 100644
index 8949666..0000000
--- a/Wikipedia/tg-cyrl.lproj/Main_iPhone.strings
+++ /dev/null
@@ -1,8 +0,0 @@
-// Messages for Tajik (Cyrillic script) (тоҷикӣ)
-// Exported from translatewiki.net
-// Author: Ibrahim
-
-"7Wa-ox-cAd.normalTitle" = "Захира";
-"AIA-vO-cLI.placeholder" = "Вироиши мати CAPTCHA text аз акси боло";
-"P0o-I6-RDJ.normalTitle" = "Лағв";
-"QGI-DM-j1P.normalTitle" = "Нишон додани дигар CAPTCHA";
diff --git a/Wikipedia/uz.lproj/Main_iPhone.strings
b/Wikipedia/uz.lproj/Main_iPhone.strings
deleted file mode 100644
index 0a6c23c..0000000
--- a/Wikipedia/uz.lproj/Main_iPhone.strings
+++ /dev/null
@@ -1,15 +0,0 @@
-// Messages for Uzbek (oʻzbekcha/ўзбекча)
-// Exported from translatewiki.net
-// Author: 6ahodir
-// Author: Таржимон
-
-"5cT-2Y-0Ie.placeholder" = "Foydalanuvchi nomi";
-"LfM-01-aCF.text" = "Ko‘rib chiqish";
-"P6J-IE-CiO.text" = "Tashlab o‘tish";
-"c3c-PU-Exz.text" = "Hisob yaratish";
-"heA-3K-nhS.text" = "Allaqachon hisobdamisiz? Kiring";
-"jiW-Cg-oL3.text" = "Hisob yaratish";
-"kVb-lx-d6C.placeholder" = "Maxfiy soʻz";
-"mAk-1N-jPC.placeholder" = "Foydalanuvchi nomi";
-"rKI-nq-3p7.placeholder" = "Elektron pochta manzili (majburiy emas)";
-"wkl-j8-wLX.text" = "Hisob yaratish";
diff --git a/Wikipedia/yi.lproj/Main_iPhone.strings
b/Wikipedia/yi.lproj/Main_iPhone.strings
deleted file mode 100644
index 4f2e892..0000000
--- a/Wikipedia/yi.lproj/Main_iPhone.strings
+++ /dev/null
@@ -1,22 +0,0 @@
-<<<<<<< HEAD (db4b8e For easier debugging of 5.0, show "Read" button.)
-=======
-// Messages for Yiddish (ייִדיש)
-// Exported from translatewiki.net
-// Author: פוילישער
-
-"5cT-2Y-0Ie.placeholder" = "באניצער־נאמען";
-"LfM-01-aCF.text" = "פֿאראויסשטעלונג";
-"P6J-IE-CiO.text" = "איבערהיפן";
-"PCr-0J-fBj.placeholder" = "פאַסווארט";
-"UgH-77-lyp.placeholder" = "ווידער אריינקלאפן פאסווארט";
-"Wff-o9-AdH.text" = "אַרײנלאגירן";
-"aUp-0e-F6i.text" = "קיין לעצטיקע בלעטער נישט דא.";
-"c3c-PU-Exz.text" = "שאַפֿן קאנטע";
-"heA-3K-nhS.text" = "איר האט שוין א קאנטע? לאגירט אריין";
-"jiW-Cg-oL3.text" = "שאַפֿן קאנטע";
-"kVb-lx-d6C.placeholder" = "פאַסווארט";
-"mAk-1N-jPC.placeholder" = "באַניצער־נאָמען";
-"rKI-nq-3p7.placeholder" = "בליצפאסט אדרעס (אפציאנאל)";
-"wVn-n7-pdy.text" = "שפראך נאמען";
-"wkl-j8-wLX.text" = "שאַפֿן קאנטע";
->>>>>>> BRANCH (ffd60b version bump)
diff --git a/Wikipedia/zh-hans.lproj/Main_iPhone.strings
b/Wikipedia/zh-hans.lproj/Main_iPhone.strings
deleted file mode 100644
index 95d9318..0000000
--- a/Wikipedia/zh-hans.lproj/Main_iPhone.strings
+++ /dev/null
@@ -1,31 +0,0 @@
-<<<<<<< HEAD (db4b8e For easier debugging of 5.0, show "Read" button.)
-=======
-// Messages for Simplified Chinese (中文（简体）)
-// Exported from translatewiki.net
-// Author: Davidzdh
-// Author: Hanyanbo98
-// Author: LNDDYL
-// Author: Liuxinyu970226
-// Author: Qiyue2001
-
-"21c-U6-yfo.normalTitle" = "显示另一个验证码";
-"5cT-2Y-0Ie.placeholder" = "用户名";
-"GiD-Rj-wb7.text" = "保存页面非常棒。试想一下在你保存后，即使离线时也可以阅读。";
-"LfM-01-aCF.text" = "预览";
-"P6J-IE-CiO.text" = "跳过";
-"PCr-0J-fBj.placeholder" = "密码";
-"UgH-77-lyp.placeholder" = "重新输入密码";
-"W1c-wQ-1pa.text" = "尚未保存页面。";
-"Wff-o9-AdH.text" = "登录";
-"aUp-0e-F6i.text" = "无最近页面。";
-"c3c-PU-Exz.text" = "创建帐户";
-"gPg-cg-Yjy.placeholder" = "输入上面图片的验证码文字";
-"heA-3K-nhS.text" = "已有帐户？登录";
-"huU-kO-aYI.text" = "您可能清空了它们。下次您前往一个页面时，可从此返回。";
-"jiW-Cg-oL3.text" = "创建帐户";
-"kVb-lx-d6C.placeholder" = "密码";
-"mAk-1N-jPC.placeholder" = "用户名";
-"rKI-nq-3p7.placeholder" = "电子邮件地址（选填）";
-"wVn-n7-pdy.text" = "语言名称";
-"wkl-j8-wLX.text" = "创建账户";
->>>>>>> BRANCH (ffd60b version bump)
diff --git a/WikipediaUnitTests/MWKSection+WMFSharingTests.m
b/WikipediaUnitTests/MWKSection+WMFSharingTests.m
index 1c181c8..a211579 100644
--- a/WikipediaUnitTests/MWKSection+WMFSharingTests.m
+++ b/WikipediaUnitTests/MWKSection+WMFSharingTests.m
@@ -24,7 +24,7 @@
}
- (void)testSimpleSnippet {
- MWKTitle* title = [[MWKSite siteWithCurrentLocale] titleWithString:@"foo"];
+ MWKTitle* title = [[MWKSite siteWithCurrentLocale]
titleWithString:@"foo"];
MWKArticle* article = [[MWKArticle alloc] initWithTitle:title
dataStore:nil];
self.section = [[MWKSection alloc] initWithArticle:article
dict:@{
@@ -35,7 +35,7 @@
}
- (void)testSimpleSnippetIncludingTable {
- MWKTitle* title = [[MWKSite siteWithCurrentLocale] titleWithString:@"foo"];
+ MWKTitle* title = [[MWKSite siteWithCurrentLocale]
titleWithString:@"foo"];
MWKArticle* article = [[MWKArticle alloc] initWithTitle:title
dataStore:nil];
self.section = [[MWKSection alloc] initWithArticle:article
dict:@{
diff --git a/WikipediaUnitTests/MWKSectionListTests.m
b/WikipediaUnitTests/MWKSectionListTests.m
index 5ff8af8..88f3dec 100644
--- a/WikipediaUnitTests/MWKSectionListTests.m
+++ b/WikipediaUnitTests/MWKSectionListTests.m
@@ -41,7 +41,7 @@
}
- (void)testCreatingSectionListWithNoData {
- MWKTitle* title = [[MWKSite siteWithCurrentLocale] titleWithString:@"foo"];
+ MWKTitle* title = [[MWKSite siteWithCurrentLocale]
titleWithString:@"foo"];
MWKArticle* mockArticle =
[[MWKArticle alloc] initWithTitle:title dataStore:self.dataStore];
MWKSectionList* emptySectionList = [[MWKSectionList alloc]
initWithArticle:mockArticle];
@@ -50,7 +50,7 @@
}
- (void)testSectionListInitializationExeptionHandling {
- MWKTitle* title = [[MWKSite siteWithCurrentLocale] titleWithString:@"foo"];
+ MWKTitle* title = [[MWKSite siteWithCurrentLocale]
titleWithString:@"foo"];
MWKArticle* mockArticle =
[[MWKArticle alloc] initWithTitle:title dataStore:self.dataStore];
diff --git a/WikipediaUnitTests/Utilities/MWKImage+AssociationTestUtils.m
b/WikipediaUnitTests/Utilities/MWKImage+AssociationTestUtils.m
index a7c793d..225f984 100644
--- a/WikipediaUnitTests/Utilities/MWKImage+AssociationTestUtils.m
+++ b/WikipediaUnitTests/Utilities/MWKImage+AssociationTestUtils.m
@@ -12,7 +12,7 @@
@implementation MWKImage (AssociationTestUtils)
+ (instancetype)imageAssociatedWithSourceURL:(NSString*)imageURL {
- MWKTitle* title = [[MWKSite siteWithCurrentLocale] titleWithString:@"foo"];
+ MWKTitle* title = [[MWKSite siteWithCurrentLocale]
titleWithString:@"foo"];
MWKArticle* article = [[MWKArticle alloc] initWithTitle:title
dataStore:nil];
return [[self alloc] initWithArticle:article sourceURL:imageURL];
}
diff --git a/WikipediaUnitTests/WMFImageInfoControllerTests.m
b/WikipediaUnitTests/WMFImageInfoControllerTests.m
index 7400927..f9579a0 100644
--- a/WikipediaUnitTests/WMFImageInfoControllerTests.m
+++ b/WikipediaUnitTests/WMFImageInfoControllerTests.m
@@ -72,10 +72,10 @@
- (void)testReadsFromDataStoreLazilyAndPopulatesFetchedIndices {
MWKImageList* mockImageList = mock([MWKImageList class]);
MWKDataStore* mockDataStore = mock([MWKDataStore class]);
- MWKTitle* title = [[MWKSite siteWithCurrentLocale] titleWithString:@"foo"];
- MWKArticle* article = [[MWKArticle alloc] initWithTitle:title
dataStore:mockDataStore];
+ MWKTitle* title = [[MWKSite siteWithCurrentLocale]
titleWithString:@"foo"];
+ MWKArticle* article = [[MWKArticle alloc] initWithTitle:title
dataStore:mockDataStore];
- NSArray* testImages = [[self generateSourceURLs:5]
bk_map:^MWKImage*(NSString* sourceURL) {
+ NSArray* testImages = [[self generateSourceURLs:5]
bk_map:^MWKImage*(NSString* sourceURL) {
return [[MWKImage alloc] initWithArticle:article sourceURL:sourceURL];
}];
NSRange preFetchedRange = NSMakeRange(0, 2);
--
To view, visit https://gerrit.wikimedia.org/r/220943
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I49ec50f938f4eb6e78c60a97620e665876da25f0
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: 5.0
Gerrit-Owner: Bgerstle <bgers...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
