|
|
@@ -137,8 +137,6 @@ FILTERED = "(filtré de|entrées totales)"
|
|
|
NO_MATCHING = "Aucun enregistrement correspondant trouvé"
|
|
|
TAB_NOT_LOADING = "Onglet ne se charge pas?"
|
|
|
TAB_NOT_LOADING_ABOUT = "Certains sites bloquent l'affichage dans un iFrame. Pour contourner cela, nous pouvons installer un plugin pour ignorer les en-têtes envoyés par ces pages web, nous permettant ainsi de charger le site. Voici le téléchargement pour votre navigateur:"
|
|
|
-<<<<<<< HEAD
|
|
|
-=======
|
|
|
MULTIPLE_LOGINS = "Multiple Logins"
|
|
|
USER_ICONS = "User Icons - Gravatar Icons"
|
|
|
USER_ICONS_ABOUT = "User icons are based off the icons that are set on Gravatar using the email address provided. If you would like to change yours or have someone add an icon to their email have them go here:"
|
|
|
@@ -151,4 +149,3 @@ TRANSLATIONS_ABOUT = "We always need help with translations. If you speak anoth
|
|
|
UPGRADE = "Upgrade"
|
|
|
LOADING_COLOR = "Loading Background"
|
|
|
HOVER_TEXT = "Hover Text"
|
|
|
->>>>>>> refs/remotes/origin/master
|
causefx