Fix localization of LOADING_DATA (use ELISION+LOADING for 'Loading...').

diff --git a/MobileCydia.app/English.lproj/Localizable.strings b/MobileCydia.app/English.lproj/Localizable.strings
index 5ef655e548da8d04cfa5eb2c5c4a15ce557bfa78..b1792a5e23ea6a02d69d7517197708ccd1bc5980 100644 (file)
--- a/MobileCydia.app/English.lproj/Localizable.strings
+++ b/MobileCydia.app/English.lproj/Localizable.strings
@@ -53,6 +53,7 @@
 "DOWNLOADING" = "Downloading";
 "DOWNLOADING_" = "Downloading %@";
 "EDIT" = "Edit";
 "DOWNLOADING" = "Downloading";
 "DOWNLOADING_" = "Downloading %@";
 "EDIT" = "Edit";

+"ELISION" = "%@...";

 "ENTER_APT_URL" = "Enter Cydia/APT URL";
 "ENTERED_BY_USER" = "Entered by User";
 "ERROR" = "Error";
 "ENTER_APT_URL" = "Enter Cydia/APT URL";
 "ENTERED_BY_USER" = "Entered by User";
 "ERROR" = "Error";


@@ -93,7 +94,7 @@
 "INSTALLED_FILES" = "Installed Files";
 "KEEP_OLD_COPY" = "Keep My Old Copy";
 "LOADING" = "Loading";
 "INSTALLED_FILES" = "Installed Files";
 "KEEP_OLD_COPY" = "Keep My Old Copy";
 "LOADING" = "Loading";

-"LOADING_DATA" = "Loading...";
+"LOADING_DATA" = "Loading Data";

 "LOCAL" = "Local";
 "LOGIN" = "Login";
 "MAILING_LISTS" = "Mailing Lists";
 "LOCAL" = "Local";
 "LOGIN" = "Login";
 "MAILING_LISTS" = "Mailing Lists";

diff --git a/MobileCydia.app/French.lproj/Localizable.strings b/MobileCydia.app/French.lproj/Localizable.strings
index bdd6988dc190acb5bfe6859f8e6b3f87fd2d99af..926fcece4eecb73d3ef4a14af6872488e1441219 100644 (file)
--- a/MobileCydia.app/French.lproj/Localizable.strings
+++ b/MobileCydia.app/French.lproj/Localizable.strings
@@ -53,6 +53,7 @@
 "DOWNLOADING" = "Télécharger";
 "DOWNLOADING_" = "Téléchargement de %@ en cours";
 "EDIT" = "Modifier";
 "DOWNLOADING" = "Télécharger";
 "DOWNLOADING_" = "Téléchargement de %@ en cours";
 "EDIT" = "Modifier";

+"ELISION" = "%@...";

 "ENTER_APT_URL" = "Entrez une adresse Cydia/APT";
 "ENTERED_BY_USER" = "Entré par l'utilisateur";
 "ERROR" = "Erreur";
 "ENTER_APT_URL" = "Entrez une adresse Cydia/APT";
 "ENTERED_BY_USER" = "Entré par l'utilisateur";
 "ERROR" = "Erreur";

diff --git a/MobileCydia.app/German.lproj/Localizable.strings b/MobileCydia.app/German.lproj/Localizable.strings
index 78a818ca8d29d7bef38cc573364b8d60bd126961..d6a92e2cc25c68995a34508d9540b05314938ce7 100644 (file)
--- a/MobileCydia.app/German.lproj/Localizable.strings
+++ b/MobileCydia.app/German.lproj/Localizable.strings
@@ -53,6 +53,7 @@
 "DOWNLOADING" = "Lädt";
 "DOWNLOADING_" = "Lädt %@ herunter";
 "EDIT" = "Bearbeiten";
 "DOWNLOADING" = "Lädt";
 "DOWNLOADING_" = "Lädt %@ herunter";
 "EDIT" = "Bearbeiten";

+"ELISION" = "%@...";

 "ENTER_APT_URL" = "Cydia/APT URL eingeben";
 "ENTERED_BY_USER" = "Vom Benutzer eingegeben";
 "ERROR" = "Fehler";
 "ENTER_APT_URL" = "Cydia/APT URL eingeben";
 "ENTERED_BY_USER" = "Vom Benutzer eingegeben";
 "ERROR" = "Fehler";

diff --git a/MobileCydia.mm b/MobileCydia.mm
index 540f98154035d5de40575afa05bf613760741b64..a3b9cddf54d541074f1417ccf840cb011fbd7c4d 100644 (file)
--- a/MobileCydia.mm
+++ b/MobileCydia.mm
@@ -2923,6 +2923,7 @@ struct PackageNameOrdering :
 /* }}} */
 
 static NSString *Colon_;
 /* }}} */
 
 static NSString *Colon_;

+static NSString *Elision_;

 static NSString *Error_;
 static NSString *Warning_;
 
 static NSString *Error_;
 static NSString *Warning_;
 


@@ -8737,7 +8738,7 @@ _trace();
     [label setTextColor:[UIColor blackColor]];
     [label setShadowColor:[UIColor whiteColor]];
     [label setShadowOffset:CGSizeMake(0, 1)];
     [label setTextColor:[UIColor blackColor]];
     [label setShadowColor:[UIColor whiteColor]];
     [label setShadowOffset:CGSizeMake(0, 1)];

-    [label setText:UCLocalize("LOADING_DATA")];
+    [label setText:[NSString stringWithFormat:Elision_, UCLocalize("LOADING"), nil]];

     [container addSubview:label];
 
     CGSize viewsize = [[tabbar_ view] frame].size;
     [container addSubview:label];
 
     CGSize viewsize = [[tabbar_ view] frame].size;


@@ -9102,6 +9103,7 @@ int main(int argc, char *argv[]) { _pooled
     /* }}} */
 
     Colon_ = UCLocalize("COLON_DELIMITED");
     /* }}} */
 
     Colon_ = UCLocalize("COLON_DELIMITED");

+    Elision_ = UCLocalize("ELISION");

     Error_ = UCLocalize("ERROR");
     Warning_ = UCLocalize("WARNING");
 
     Error_ = UCLocalize("ERROR");
     Warning_ = UCLocalize("WARNING");