French translations

This commit is contained in:
burke.davey
2010-08-07 19:49:37 +00:00
parent c1140f066d
commit 01814f7c63
3 changed files with 25 additions and 17 deletions

View File

@@ -92,7 +92,7 @@ public class C2DMReceiver extends C2DMBaseReceiver {
SharedPreferences settings = Prefs.get(context); SharedPreferences settings = Prefs.get(context);
Intent launchIntent = getLaunchIntent(context, url, title, sel); Intent launchIntent = getLaunchIntent(context, url, title, sel);
if (settings.getBoolean("launchBrowserOrMaps", false) && launchIntent != null) { if (settings.getBoolean("launchBrowserOrMaps", true) && launchIntent != null) {
playNotificationSound(context); playNotificationSound(context);
context.startActivity(launchIntent); context.startActivity(launchIntent);
} else { } else {

View File

@@ -25,13 +25,17 @@ public class HelpActivity extends Activity {
public static String getTOSLink() { public static String getTOSLink() {
String link = "http://m.google.com/toscountry"; // default String link = "http://m.google.com/toscountry"; // default
String country = Locale.getDefault().getCountry(); String locale = Locale.getDefault().toString();
if (country.equals("US")) { if (locale.equals(Locale.US.toString())) {
link = "http://m.google.com/tospage"; link = "http://m.google.com/tospage";
} else if (country.equals("GB")) { } else if (locale.equals(Locale.UK.toString())) {
link = "http://m.google.co.uk/tospage"; link = "http://m.google.co.uk/tospage";
} else if (country.equals("CA")) { } else if (locale.equals(Locale.CANADA.toString())) {
link = "http://m.google.ca/tospage"; link = "http://m.google.ca/tospage";
} else if (locale.equals(Locale.CANADA_FRENCH.toString())) {
link = "http://m.google.ca/tospage?hl=fr";
} else if (locale.equals(Locale.FRANCE.toString())) {
link = "http://m.google.fr/tospage";
} }
return link; return link;
} }
@@ -39,13 +43,17 @@ public class HelpActivity extends Activity {
public static String getPPLink() { public static String getPPLink() {
String link = "http://m.google.com/privacy"; // default String link = "http://m.google.com/privacy"; // default
String country = Locale.getDefault().getCountry(); String locale = Locale.getDefault().toString();
if (country.equals("US")) { if (locale.toString().equals(Locale.US.toString())) {
link = "http://m.google.com/privacy"; link = "http://m.google.com/privacy";
} else if (country.equals("GB")) { } else if (locale.toString().equals(Locale.UK.toString())) {
link = "http://m.google.co.uk/privacy"; link = "http://m.google.co.uk/privacy";
} else if (country.equals("CA")) { } else if (locale.toString().equals(Locale.CANADA.toString())) {
link = "http://m.google.ca/privacy"; link = "http://m.google.ca/privacy";
} else if (locale.toString().equals(Locale.CANADA_FRENCH.toString())) {
link = "http://m.google.ca/privacy?hl=fr";
} else if (locale.toString().equals(Locale.FRANCE.toString())) {
link = "http://m.google.fr/privacy";
} }
return link; return link;
} }

View File

@@ -1,10 +1,10 @@
{ {
"app_name": { "app_name": {
"message": "Extension 'Chrome to Phone' par Google", "message": "Extension Chrome to Phone par Google",
"description": "Name of the application" "description": "Name of the application"
}, },
"app_desc": { "app_desc": {
"message": "Lextension 'Chrome to Phone' par Google vous permet denvoyer des liens et autres informations depuis Chrome vers votre appareil Android.", "message": "Lextension Chrome to Phone par Google vous permet denvoyer des liens et autres informations depuis Chrome vers votre appareil Android.",
"description": "Description of the application." "description": "Description of the application."
}, },
"sending_message": { "sending_message": {
@@ -64,7 +64,7 @@
"description": "Section title in help." "description": "Section title in help."
}, },
"about_message": { "about_message": {
"message": "'Chrome to Phone', par Google, vous permet d'envoyer des liens et autres informations depuis Chrome vers votre appareil Android.<br>'Chrome to Phone' consiste d'une extension au navigateur Chrome et d'une application Android.", "message": "Chrome to Phone, par Google, vous permet d'envoyer des liens et autres informations depuis Chrome vers votre appareil Android.<br>Chrome to Phone consiste d'une extension au navigateur Chrome et d'une application Android.",
"description": "About message in help." "description": "About message in help."
}, },
"features_title_message": { "features_title_message": {
@@ -76,19 +76,19 @@
"description": "Features message in help." "description": "Features message in help."
}, },
"step2_message": { "step2_message": {
"message": "Recherchez 'Chrome to Phone' à chrome.google.com/extensions.", "message": "Recherchez Chrome to Phone à chrome.google.com/extensions.",
"description": "Comic step 2 in help." "description": "Comic step 2 in help."
}, },
"step3_message": { "step3_message": {
"message": "Installez l'extension 'Chrome to Phone' et cliquez sur l'icône de la barre d'outils pour vous connecter.", "message": "Installez l'extension Chrome to Phone et cliquez sur l'icône de la barre d'outils pour vous connecter.",
"description": "Comic step 3 in help." "description": "Comic step 3 in help."
}, },
"step4_message": { "step4_message": {
"message": "Recherchez 'Chrome to Phone' sur le Market depuis votre appareil Android.", "message": "Recherchez Chrome to Phone sur le Market depuis votre appareil Android.",
"description": "Comic step 4 in help." "description": "Comic step 4 in help."
}, },
"step5_message": { "step5_message": {
"message": "Installez l'application Android 'Chrome to Phone' et suivez les instructions de configuration.", "message": "Installez l'application Android Chrome to Phone et suivez les instructions de configuration.",
"description": "Comic step 5 in help." "description": "Comic step 5 in help."
}, },
"step6_message": { "step6_message": {
@@ -116,7 +116,7 @@
"description": "Signed out section title." "description": "Signed out section title."
}, },
"signed_out_message": { "signed_out_message": {
"message": "Vous êtes désormais déconnecté de 'Chrome to Phone'.", "message": "Vous êtes désormais déconnecté de Chrome to Phone.",
"description": "Signed out message." "description": "Signed out message."
} }
} }