From 4b0a2e1385d32ffe0104d5a4a12557d0cc5b5871 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Tue, 6 Jan 2015 17:06:31 -0500
Subject: [PATCH] gnome client: replace SFLPhone by Ring

Refs #62387

Change-Id: I3ecf72230e39d29b8917469bbd8c302fd8629cfb
---
 gnome/.gitignore                              |  4 +-
 gnome/Makefile.am                             | 10 +-
 gnome/configure.ac                            |  6 +-
 gnome/doc/es/es.po                            | 96 +++++++++----------
 gnome/doc/fr/fr.po                            | 88 ++++++++---------
 gnome/man/Makefile.am                         |  6 +-
 gnome/man/ring-client-gnome.pod               | 38 ++++++++
 gnome/man/ring.pod                            |  1 +
 gnome/man/sflphone-client-gnome.pod           | 39 --------
 gnome/man/sflphone.pod                        |  1 -
 gnome/po/POTFILES.in                          |  6 +-
 gnome/po/ab.po                                | 40 ++++----
 gnome/po/ar.po                                | 46 ++++-----
 gnome/po/ast.po                               | 46 ++++-----
 gnome/po/ca.po                                | 40 ++++----
 gnome/po/cs.po                                | 46 ++++-----
 gnome/po/da.po                                | 40 ++++----
 gnome/po/de.po                                | 48 +++++-----
 gnome/po/el.po                                | 38 ++++----
 gnome/po/es.po                                | 48 +++++-----
 gnome/po/et.po                                | 30 +++---
 gnome/po/fa.po                                | 46 ++++-----
 gnome/po/fr.po                                | 54 +++++------
 gnome/po/hu.po                                | 42 ++++----
 gnome/po/it.po                                | 42 ++++----
 gnome/po/ja.po                                | 40 ++++----
 gnome/po/ko.po                                | 32 +++----
 gnome/po/nl.po                                | 48 +++++-----
 gnome/po/oc.po                                | 42 ++++----
 gnome/po/pl.po                                | 36 +++----
 gnome/po/pt.po                                | 40 ++++----
 gnome/po/pt_BR.po                             | 48 +++++-----
 gnome/po/ru.po                                | 48 +++++-----
 gnome/po/sr.po                                | 42 ++++----
 gnome/po/sv.po                                | 40 ++++----
 gnome/po/te.po                                | 32 +++----
 gnome/po/tr.po                                | 40 ++++----
 gnome/po/translations-tests/merge.py          |  4 +-
 gnome/po/uz.po                                | 30 +++---
 gnome/po/vi.po                                | 46 ++++-----
 gnome/po/zh_CN.po                             | 44 ++++-----
 gnome/po/zh_HK.po                             | 44 ++++-----
 gnome/po/zh_TW.po                             | 44 ++++-----
 .../{sflphone.desktop.in => ring.desktop.in}  |  8 +-
 gnome/src/Makefile.am                         | 36 +++----
 gnome/src/actions.h                           |  2 +-
 gnome/src/config/accountlistconfigdialog.h    |  2 +-
 gnome/src/config/addressbook-config.c         |  2 +-
 gnome/src/config/addressbook-config.h         |  2 +-
 gnome/src/config/audioconf.h                  |  2 +-
 gnome/src/config/preferencesdialog.h          |  2 +-
 gnome/src/config/tlsadvanceddialog.h          |  2 +-
 gnome/src/config/zrtpadvanceddialog.h         |  2 +-
 gnome/src/contacts/calllist.h                 |  2 +-
 gnome/src/contacts/calltab.h                  |  2 +-
 gnome/src/contacts/calltree.c                 |  2 +-
 gnome/src/contacts/calltree.h                 |  2 +-
 gnome/src/dbus/dbus.c                         |  2 +-
 gnome/src/dialpad.h                           |  2 +-
 gnome/src/main.c                              |  4 +-
 gnome/src/messaging/message_tab.h             |  2 +-
 gnome/src/presence.h                          |  2 +-
 gnome/src/presencewindow.h                    |  2 +-
 .../src/{sflphone_client.c => ring_client.c}  | 34 +++----
 .../src/{sflphone_client.h => ring_client.h}  | 12 +--
 .../src/{sflphone_menus.ui => ring_menus.ui}  |  0
 .../{sflphone_options.c => ring_options.c}    |  2 +-
 .../{sflphone_options.h => ring_options.h}    |  6 +-
 gnome/src/sflnotify.h                         |  2 +-
 gnome/src/shortcuts.h                         |  2 +-
 gnome/src/statusicon.h                        |  2 +-
 gnome/src/uimanager.c                         |  6 +-
 gnome/src/uimanager.h                         |  2 +-
 gnome/src/video/video_callbacks.h             |  2 +-
 gnome/src/video/video_widget.c                |  4 +-
 gnome/src/video/video_window.c                |  4 +-
 gnome/tests/Makefile.am                       |  8 +-
 77 files changed, 884 insertions(+), 885 deletions(-)
 create mode 100644 gnome/man/ring-client-gnome.pod
 create mode 120000 gnome/man/ring.pod
 delete mode 100644 gnome/man/sflphone-client-gnome.pod
 delete mode 120000 gnome/man/sflphone.pod
 rename gnome/{sflphone.desktop.in => ring.desktop.in} (65%)
 rename gnome/src/{sflphone_client.c => ring_client.c} (85%)
 rename gnome/src/{sflphone_client.h => ring_client.h} (86%)
 rename gnome/src/{sflphone_menus.ui => ring_menus.ui} (100%)
 rename gnome/src/{sflphone_options.c => ring_options.c} (98%)
 rename gnome/src/{sflphone_options.h => ring_options.h} (94%)

diff --git a/gnome/.gitignore b/gnome/.gitignore
index b417071833..81545a0d2b 100644
--- a/gnome/.gitignore
+++ b/gnome/.gitignore
@@ -105,6 +105,7 @@
 /po/Makefile.in.in
 /po/Makevars.template
 /po/POTFILES
+/po/Ring.pot
 /po/Rules-quot
 /po/boldquot.sed
 /po/en@boldquot.header
@@ -112,9 +113,8 @@
 /po/insert-header.sin
 /po/quot.sed
 /po/remove-potcdate.sin
-/po/sflphone.pot
 /po/stamp-it
-/sflphone.desktop
+/ring.desktop
 /so_locations
 /src/Makefile.in
 /src/config/Makefile.in
diff --git a/gnome/Makefile.am b/gnome/Makefile.am
index 2dbe7ddfb5..b5ac19c025 100644
--- a/gnome/Makefile.am
+++ b/gnome/Makefile.am
@@ -3,17 +3,17 @@ SUBDIRS = src pixmaps tests man po doc data
 
 CFLAGS=-Wall -Werror -Wextra
 
-uidir=$(datadir)/sflphone/ui
-ui_DATA=src/sflphone_menus.ui
+uidir=$(datadir)/ring/ui
+ui_DATA=src/ring_menus.ui
 
 dist_noinst_DATA = $(gsettings_in_file)
 
-EXTRA_DIST  = sflphone.desktop.in m4 $(ui_DATA) $(apps_DATA)
+EXTRA_DIST  = ring.desktop.in m4 $(ui_DATA) $(apps_DATA)
 appsdir = $(datadir)/applications
-apps_in_files = sflphone.desktop.in
+apps_in_files = ring.desktop.in
 apps_DATA = $(apps_in_files:.desktop.in=.desktop)
 
-DISTCLEANFILES= sflphone.desktop
+DISTCLEANFILES= ring.desktop
 
 MAINTAINERCLEANFILES = \
 						$(srcdir)/INSTALL \
diff --git a/gnome/configure.ac b/gnome/configure.ac
index 08de023acc..a838f8f17f 100644
--- a/gnome/configure.ac
+++ b/gnome/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ([2.64])
 
-AC_INIT([sflphone],[1.4.2],[sflphoneteam@savoirfairelinux.com],[sflphone-client-gnome])
+AC_INIT([Ring],[1.4.2],[sflphoneteam@savoirfairelinux.com],[ring-client-gnome])
 
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_HEADERS([config.h])
@@ -27,7 +27,7 @@ CFLAGS="$CFLAGS -Wall -Wextra -Wshadow"
 
 dnl uninstalled gsr ui dir
 AC_DEFINE_UNQUOTED(SFLPHONE_UIDIR_UNINSTALLED, "`pwd`/src/",
-  [path to uninstalled SFLphone UI dir])
+  [path to uninstalled Ring UI dir])
 
 PKG_CHECK_MODULES(DBUSGLIB, dbus-glib-1 >= 0.75);
 
@@ -89,7 +89,7 @@ src/video/Makefile
 src/icons/Makefile
 src/messaging/Makefile
 pixmaps/Makefile
-sflphone.desktop
+ring.desktop
 tests/Makefile
 man/Makefile
 doc/Makefile
diff --git a/gnome/doc/es/es.po b/gnome/doc/es/es.po
index 2d243741c0..7980ca3a44 100644
--- a/gnome/doc/es/es.po
+++ b/gnome/doc/es/es.po
@@ -179,8 +179,8 @@ msgstr ""
 "md5=eb4a5545f137b825dcdaf0396a9f1a7d"
 
 #: sflphone.xml:12(title)
-msgid "SFLphone Manual v1.0"
-msgstr "Manual v1.0 de SFLphone"
+msgid "Ring Manual v1.0"
+msgstr "Manual v1.0 de Ring"
 
 #: sflphone.xml:15(year)
 msgid "2006"
@@ -204,10 +204,10 @@ msgstr "Savoir-faire Linux"
 
 #: sflphone.xml:26(para)
 msgid ""
-"SFLphone is an enterprise-class SIP/IAX2 compatible softphone for GNU/Linux, "
+"Ring is an enterprise-class SIP/IAX2 compatible softphone for GNU/Linux, "
 "published under the GPLv3 license."
 msgstr ""
-"SFLphone es un softphone de clase empresarial compatible con SIP y IAX2 para "
+"Ring es un softphone de clase empresarial compatible con SIP y IAX2 para "
 "GNU/Linux, publicado bajo la licencia GPLv3."
 
 #: sflphone.xml:36(para)
@@ -288,24 +288,24 @@ msgid "alexandre.savard@savoirfairelinux.com"
 msgstr "alexandre.savard@savoirfairelinux.com"
 
 #: sflphone.xml:76(revnumber)
-msgid "SFLphone Manual V1.0"
-msgstr "Manual v. 1.0 de SFLphone"
+msgid "Ring Manual V1.0"
+msgstr "Manual v. 1.0 de Ring"
 
 #: sflphone.xml:77(date)
 msgid "September 2009"
 msgstr "Septiembre del 2009"
 
 #: sflphone.xml:79(para)
-msgid "SFLphone team"
-msgstr "Equipo de SFLphone"
+msgid "Ring team"
+msgstr "Equipo de Ring"
 
 #: sflphone.xml:85(releaseinfo)
-msgid "This manual describes version 0.9.7 of SFLphone."
-msgstr "Este manual describe la versión 0.9.7 de SFLphone."
+msgid "This manual describes version 0.9.7 of Ring."
+msgstr "Este manual describe la versión 0.9.7 de Ring."
 
 #: sflphone.xml:90(primary)
-msgid "SFLphone"
-msgstr "SFLphone"
+msgid "Ring"
+msgstr "Ring"
 
 #: sflphone.xml:94(title)
 msgid "Introduction"
@@ -313,22 +313,22 @@ msgstr "Introducción"
 
 #: sflphone.xml:95(para)
 msgid ""
-"<application>SFLphone</application> is a SIP/IAX2 softphone and VoIP client "
+"<application>Ring</application> is a SIP/IAX2 softphone and VoIP client "
 "for GNU/Linux. It aims at being a robust enterprise-class desktop phone and "
 "has been designed with a hundred-calls-a-day receptionist in mind."
 msgstr ""
-"<application>SFLphone</application> es un softphone SIP y IAX2 y cliente "
+"<application>Ring</application> es un softphone SIP y IAX2 y cliente "
 "VoIP para GNU/Linux. Està dirigido a ser un telefono robusto de clase "
 "empresarial y fue diseñado por una recepcionista de cien llamadas al dia."
 
 #: sflphone.xml:98(para)
 msgid ""
-"<application>SFLphone</application> is a free software and is distributed "
+"<application>Ring</application> is a free software and is distributed "
 "under the GNU General Public License version 3. It is developed by Savoir-"
 "Faire Linux, a Canadian Linux consulting company, in partnership with the "
 "global community."
 msgstr ""
-"<application>SFLphone</application> es un software libre distribuido bajo la "
+"<application>Ring</application> es un software libre distribuido bajo la "
 "Licencia Pública General de GNU versión 3. Esta desarrollando por Savoir-"
 "Faire Linux, una empresa canadiense de consultorio Linux, en colaboración "
 "con la comunidad global."
@@ -338,7 +338,7 @@ msgid ""
 "Among the many features we developed for you, we could highlight the high "
 "definition sound (wide-band audio codecs - speex, G722, Celt), multiple "
 "conference call, audio recording, voicemail notification, and call history. "
-"More than a simple softphone, <application>SFLphone</application> supports "
+"More than a simple softphone, <application>Ring</application> supports "
 "advanced enterprise-class call features: unlimited number of calls, call "
 "transfer, and on/off hold option."
 msgstr ""
@@ -346,7 +346,7 @@ msgstr ""
 "podría destacar el alto sonido de la definición (codificadores-decodificador "
 "audios de la banda ancha - speex, G722, Celt), la audioconferencia múltiple, "
 "la grabación audio, la notificación del buzón de voz, y la historia de "
-"llamada. Más que un softphone simple, <application>SFLphone</application> "
+"llamada. Más que un softphone simple, <application>Ring</application> "
 "soporta características de llamadas avanzadas de clase empresarial : número "
 "ilimitado de llamadas, transferencia de llamadas, y opción de llamadas en "
 "espera."
@@ -360,11 +360,11 @@ msgstr ""
 
 #: sflphone.xml:112(para)
 msgid ""
-"Besides the native ALSA interface, <application>SFLphone</application> now "
+"Besides the native ALSA interface, <application>Ring</application> now "
 "fully supports PulseAudio sound server so you could experience the great "
 "possibilities it offers (sound mixing, per application volume control, ...)."
 msgstr ""
-"Además del interfaz nativo ALSA, <application>SFLphone</application> ahora "
+"Además del interfaz nativo ALSA, <application>Ring</application> ahora "
 "soporta completamente el servidor de sonidos PulseAudio así que usted podría "
 "experimentar las grandes posibilidades que ofrece (mezcla de sonidos, "
 "control de volumen por aplicación,…)."
@@ -406,13 +406,13 @@ msgstr "Registrar una cuenta SIP o IAX2 existente"
 #: sflphone.xml:130(para)
 msgid ""
 "Click there if you already have an account and you want to use it with "
-"SFLphone. You will be prompted to select the account type (SIP or IAX2) and "
-"to fill out your account information. <application>SFLphone</application> "
+"Ring. You will be prompted to select the account type (SIP or IAX2) and "
+"to fill out your account information. <application>Ring</application> "
 "will then try to register it so you could start using it."
 msgstr ""
-"Chasque allí si usted tiene ya una cuenta y quiere utilizarla con SFLphone. "
+"Chasque allí si usted tiene ya una cuenta y quiere utilizarla con Ring. "
 "Le preguntarán a seleccionar el tipo de la cuenta (SIP o IAX2) y completar "
-"su información de cuenta. <application>SFLphone</application> intentará "
+"su información de cuenta. <application>Ring</application> intentará "
 "registrarla así que usted podría comenzar a usarla."
 
 #: sflphone.xml:119(para)
@@ -441,8 +441,8 @@ msgstr "Administrar sus cuentas"
 
 #: sflphone.xml:142(para)
 msgid ""
-"<application>SFLphone</application> supports both IAX2 and SIP accounts."
-msgstr "<application>SFLphone</application> soporta cuentas IAX2 y SIP."
+"<application>Ring</application> supports both IAX2 and SIP accounts."
+msgstr "<application>Ring</application> soporta cuentas IAX2 y SIP."
 
 #: sflphone.xml:148(title)
 msgid "Basic features"
@@ -608,11 +608,11 @@ msgstr ""
 #: sflphone.xml:212(para)
 msgid ""
 "The first account in the account in list will be used as the default account "
-"to make calls with. If it is not registered, SFLphone will try to use the "
+"to make calls with. If it is not registered, Ring will try to use the "
 "second in the list, if still not registered, the third, and so one ..."
 msgstr ""
 "La primera cuenta en la lista será utilizada como la cuenta por defecto para "
-"hacer llamadas. Si no se registra, SFLphone intentará utilizar la segunda en "
+"hacer llamadas. Si no se registra, Ring intentará utilizar la segunda en "
 "la lista, si tampoco se registra, la tercera, etc…"
 
 #: sflphone.xml:213(para)
@@ -719,11 +719,11 @@ msgstr "Fije la dirección publicada y el puerto"
 msgid ""
 "If enabled, the core will try to initialize an UDP transport on the mapped "
 "address/port number that the NAT (Network Address Translator) has allocated "
-"to <application>SFLphone</application>."
+"to <application>Ring</application>."
 msgstr ""
 "Si está activada, la base intentará inicializar un transporte UDP con la "
 "dirección y puerto que el NAT (traductor de dirección de red) ha asignado a "
-"<application>SFLphone</application>."
+"<application>Ring</application>."
 
 #: sflphone.xml:259(listitem)
 msgid "Using STUN <placeholder-1/>"
@@ -924,10 +924,10 @@ msgstr ""
 
 #: sflphone.xml:514(para)
 msgid ""
-"SFLphone now supports conference call hosting integrating server like "
+"Ring now supports conference call hosting integrating server like "
 "features in a simple GUI."
 msgstr ""
-"SFLphone ahora apoya el recibimiento de la audioconferencia, integrando "
+"Ring ahora apoya el recibimiento de la audioconferencia, integrando "
 "características de servidor en un GUI fácil."
 
 #: sflphone.xml:520(guilabel)
@@ -949,12 +949,12 @@ msgstr "Salir de la conferencia"
 
 #: sflphone.xml:529(para)
 msgid ""
-"SFLphone conference model let you leave a conference that you are currently "
+"Ring conference model let you leave a conference that you are currently "
 "hosting to answer any other incoming communication or even initiate new "
 "ones. The conference is not interupted Double clicking the conference icon "
 "let you reintroduce the conference."
 msgstr ""
-"El modelo de la conferencia de SFLphone le dejó dejar una conferencia que "
+"El modelo de la conferencia de Ring le dejó dejar una conferencia que "
 "usted está recibiendo actualmente para contestar a cualquier otras nuevas "
 "llamadas o iniciar otras. La conferencia no es cortada, doble chasca el "
 "icono de la conferencia le dejó regresar a la conferencia."
@@ -965,11 +965,11 @@ msgstr "Conferencia múltiple"
 
 #: sflphone.xml:539(para)
 msgid ""
-"SFLphone supports multiple conferences running simultaneously. Two "
+"Ring supports multiple conferences running simultaneously. Two "
 "conferences can be joined the same way they are created, dragging one on the "
 "other."
 msgstr ""
-"SFLphone apoya múltiples conferencias que funcionan simultáneamente. Dos "
+"Ring apoya múltiples conferencias que funcionan simultáneamente. Dos "
 "conferencias se pueden ensamblar de la misma manera que se crean, "
 "arrastrando una en la otra."
 
@@ -999,9 +999,9 @@ msgid "Codecs overview"
 msgstr "Descripción de los codificadores-decodificador"
 
 #: sflphone.xml:583(para)
-msgid "SFLphone supports several widely used audio codec:"
+msgid "Ring supports several widely used audio codec:"
 msgstr ""
-"SFLphone apoya varios codificador-decodificador audio ampliamente utilizado:"
+"Ring apoya varios codificador-decodificador audio ampliamente utilizado:"
 
 #: sflphone.xml:587(guilabel)
 msgid "PCMU/PCMA"
@@ -1092,11 +1092,11 @@ msgstr ""
 #: sflphone.xml:645(para)
 msgid ""
 "Every address books you configured in Evolution will be now available in "
-"<application>SFLphone</application>. Please be sure you selected at least "
+"<application>Ring</application>. Please be sure you selected at least "
 "one address book."
 msgstr ""
 "Cada libreta de contactos configurada en Evolución estara disponible en "
-"<application>SFLphone</application>. Por favor de asegurarse de seleccionar "
+"<application>Ring</application>. Por favor de asegurarse de seleccionar "
 "por lo menos una libreta."
 
 #: sflphone.xml:649(title)
@@ -1255,10 +1255,10 @@ msgstr "Mostrar ventana principal al recibir una llamada"
 
 #: sflphone.xml:785(para)
 msgid ""
-"If SFLphone is closed on the system tray, pops the main window up on "
+"If Ring is closed on the system tray, pops the main window up on "
 "foreground when receiving an incoming call."
 msgstr ""
-"Si SFLphone esta cerrado en la bandeja del sistema, exhibe la ventana "
+"Si Ring esta cerrado en la bandeja del sistema, exhibe la ventana "
 "principal emergente en primero plano para recibir una llamada entrante."
 
 #: sflphone.xml:790(guilabel)
@@ -1267,19 +1267,19 @@ msgstr "Nuncà exhibe la ventana principal emergente"
 
 #: sflphone.xml:791(para)
 msgid ""
-"If SFLphone is closed on the system tray, never pops the main window up on "
+"If Ring is closed on the system tray, never pops the main window up on "
 "foreground when receiving an incoming call."
 msgstr ""
-"Si SFLphone esta cerrado en la bandeja del sistema, nunca exhibe la ventana "
+"Si Ring esta cerrado en la bandeja del sistema, nunca exhibe la ventana "
 "principal emergente en primero plano para recibir una llamada entrante."
 
 #: sflphone.xml:796(guilabel)
-msgid "Hide SFLphone window on startup"
-msgstr "Esconder la pantalla de SFLphone al principio"
+msgid "Hide Ring window on startup"
+msgstr "Esconder la pantalla de Ring al principio"
 
 #: sflphone.xml:797(para)
-msgid "On startup, SFLphone will go directly on the system tray."
-msgstr "Al principio, SFLphone ira directamente a la bandeja del sistema."
+msgid "On startup, Ring will go directly on the system tray."
+msgstr "Al principio, Ring ira directamente a la bandeja del sistema."
 
 #: sflphone.xml:810(title)
 msgid "Calls history options"
diff --git a/gnome/doc/fr/fr.po b/gnome/doc/fr/fr.po
index f9da713d2e..06092b6556 100644
--- a/gnome/doc/fr/fr.po
+++ b/gnome/doc/fr/fr.po
@@ -161,8 +161,8 @@ msgid ""
 msgstr "not used"
 
 #: sflphone.xml:12(title)
-msgid "SFLphone Manual v1.0"
-msgstr "Manuel d'utilisateur de SFLphone v1.0"
+msgid "Ring Manual v1.0"
+msgstr "Manuel d'utilisateur de Ring v1.0"
 
 #: sflphone.xml:15(year)
 msgid "2006"
@@ -186,10 +186,10 @@ msgstr "Savoir-faire Linux"
 
 #: sflphone.xml:26(para)
 msgid ""
-"SFLphone is an enterprise-class SIP/IAX2 compatible softphone for GNU/Linux, "
+"Ring is an enterprise-class SIP/IAX2 compatible softphone for GNU/Linux, "
 "published under the GPLv3 license."
 msgstr ""
-"SFLphone est téléphone logiciel de voix sur IP pour GNU/LINUX destiné aux "
+"Ring est téléphone logiciel de voix sur IP pour GNU/LINUX destiné aux "
 "entreprises, compatible avec les protocoles SIP et IAX2. Il est distribué "
 "sous licence GPLv3."
 
@@ -260,24 +260,24 @@ msgid "alexandre.savard@savoirfairelinux.com"
 msgstr "alexandre.savard@savoirfairelinux.com"
 
 #: sflphone.xml:76(revnumber)
-msgid "SFLphone Manual V1.0"
-msgstr "Manuel de l'utilisateur pour SFLphone V1.0"
+msgid "Ring Manual V1.0"
+msgstr "Manuel de l'utilisateur pour Ring V1.0"
 
 #: sflphone.xml:77(date)
 msgid "September 2009"
 msgstr "Septembre 2009"
 
 #: sflphone.xml:79(para)
-msgid "SFLphone team"
-msgstr "Équipe SFLphone"
+msgid "Ring team"
+msgstr "Équipe Ring"
 
 #: sflphone.xml:85(releaseinfo)
-msgid "This manual describes version 0.9.7 of SFLphone."
-msgstr "Ce manuel décrit la version 0.9.7 de SFLphone."
+msgid "This manual describes version 0.9.7 of Ring."
+msgstr "Ce manuel décrit la version 0.9.7 de Ring."
 
 #: sflphone.xml:90(primary)
-msgid "SFLphone"
-msgstr "SFLphone"
+msgid "Ring"
+msgstr "Ring"
 
 #: sflphone.xml:94(title)
 msgid "Introduction"
@@ -285,23 +285,23 @@ msgstr "Introduction"
 
 #: sflphone.xml:95(para)
 msgid ""
-"<application>SFLphone</application> is a SIP/IAX2 softphone and VoIP client "
+"<application>Ring</application> is a SIP/IAX2 softphone and VoIP client "
 "for GNU/Linux. It aims at being a robust enterprise-class desktop phone and "
 "has been designed with a hundred-calls-a-day receptionist in mind."
 msgstr ""
-"<application>SFLphone</application> est un softphone compatible avec SIP et "
+"<application>Ring</application> est un softphone compatible avec SIP et "
 "IAX2 et un client de voix sur IP pour GNU/Linux. Notre but est d'offrir un "
 "téléphone logiciel intégré au bureau, robuste, destiné à une utilisation "
 "professionnelle."
 
 #: sflphone.xml:98(para)
 msgid ""
-"<application>SFLphone</application> is a free software and is distributed "
+"<application>Ring</application> is a free software and is distributed "
 "under the GNU General Public License version 3. It is developed by Savoir-"
 "Faire Linux, a Canadian Linux consulting company, in partnership with the "
 "global community."
 msgstr ""
-"<application>SFLphone</application> est un logiciel open-source distribué "
+"<application>Ring</application> est un logiciel open-source distribué "
 "sous licence GNU GPL version 3. Il est développé par la compagnie de "
 "consultation canadienne  Savoir-faire Linux, en collaboration avec la "
 "communauté."
@@ -311,15 +311,15 @@ msgid ""
 "Among the many features we developed for you, we could highlight the high "
 "definition sound (wide-band audio codecs - speex, G722, Celt), multiple "
 "conference call, audio recording, voicemail notification, and call history. "
-"More than a simple softphone, <application>SFLphone</application> supports "
+"More than a simple softphone, <application>Ring</application> supports "
 "advanced enterprise-class call features: unlimited number of calls, call "
 "transfer, and on/off hold option."
 msgstr ""
-"Parmi les nombreuses fonctionnalités de SFLphone, on peut noter notamment la "
+"Parmi les nombreuses fonctionnalités de Ring, on peut noter notamment la "
 "qualité de son haute-définition (codecs audio large bande - speex, G722, "
 "Celt), conférences multiples, enregistrement d'appel, notification de "
 "messages vocaux and historique d'appels. Plus qu'un simple téléphone "
-"logiciel, <application>SFLphone</application> supporte des fonctionnalités "
+"logiciel, <application>Ring</application> supporte des fonctionnalités "
 "avancées destinées aux entreprises: nombre illimité d'appels, transfert, "
 "mise en attente."
 
@@ -332,11 +332,11 @@ msgstr ""
 
 #: sflphone.xml:112(para)
 msgid ""
-"Besides the native ALSA interface, <application>SFLphone</application> now "
+"Besides the native ALSA interface, <application>Ring</application> now "
 "fully supports PulseAudio sound server so you could experience the great "
 "possibilities it offers (sound mixing, per application volume control, ...)."
 msgstr ""
-"En plus de l'interface native ALSA, <application>SFLphone</application> "
+"En plus de l'interface native ALSA, <application>Ring</application> "
 "supporte nativement le serveur de son PulseAudio. Profitez ainsi pleinement "
 "des possibiltés qu'il apporte (mixage logiciel, gestion des volumes par "
 "application, ...)."
@@ -377,12 +377,12 @@ msgstr "Enregistrer un compte SIP ou IAX2 existant"
 #: sflphone.xml:130(para)
 msgid ""
 "Click there if you already have an account and you want to use it with "
-"SFLphone. You will be prompted to select the account type (SIP or IAX2) and "
-"to fill out your account information. <application>SFLphone</application> "
+"Ring. You will be prompted to select the account type (SIP or IAX2) and "
+"to fill out your account information. <application>Ring</application> "
 "will then try to register it so you could start using it."
 msgstr ""
 "Choisissez cette option si vous avez déjà un compte et désirez l'utiliser "
-"avec SFLphone. Il faut ensuite choisir le type de compte (SIP ou IAX2) et "
+"avec Ring. Il faut ensuite choisir le type de compte (SIP ou IAX2) et "
 "remplir les informations nécessaires."
 
 #: sflphone.xml:119(para)
@@ -391,7 +391,7 @@ msgid ""
 "to set up your(s) account(s). This account configuration manager offers you "
 "two possibilities: <placeholder-1/>"
 msgstr ""
-"La première fois que vous lancez SFLphone, un assistant se lance pour vous "
+"La première fois que vous lancez Ring, un assistant se lance pour vous "
 "aider à configurer vos comptes. Vous avez alors deux "
 "possibilités:<placeholder-1/>"
 
@@ -411,9 +411,9 @@ msgstr "Gérer vos comptes"
 
 #: sflphone.xml:142(para)
 msgid ""
-"<application>SFLphone</application> supports both IAX2 and SIP accounts."
+"<application>Ring</application> supports both IAX2 and SIP accounts."
 msgstr ""
-"<application>SFLphone</application> supporte des comptes IAX2 et SIP."
+"<application>Ring</application> supporte des comptes IAX2 et SIP."
 
 #: sflphone.xml:148(title)
 msgid "Basic features"
@@ -584,11 +584,11 @@ msgstr ""
 #: sflphone.xml:212(para)
 msgid ""
 "The first account in the account in list will be used as the default account "
-"to make calls with. If it is not registered, SFLphone will try to use the "
+"to make calls with. If it is not registered, Ring will try to use the "
 "second in the list, if still not registered, the third, and so one ..."
 msgstr ""
 "Le premier compte dans la lsite sera utilisé comme le compte par défaut pour "
-"passer des appels. Si ce compte n'est pas enregistré, SFLphone va essayer "
+"passer des appels. Si ce compte n'est pas enregistré, Ring va essayer "
 "d'utiliser le suivant dans la liste, etc ..."
 
 #: sflphone.xml:213(para)
@@ -691,7 +691,7 @@ msgstr "Configurer l'adresse et le port de publication"
 msgid ""
 "If enabled, the core will try to initialize an UDP transport on the mapped "
 "address/port number that the NAT (Network Address Translator) has allocated "
-"to <application>SFLphone</application>."
+"to <application>Ring</application>."
 msgstr ""
 
 #: sflphone.xml:259(listitem)
@@ -892,7 +892,7 @@ msgstr ""
 
 #: sflphone.xml:514(para)
 msgid ""
-"SFLphone now supports conference call hosting integrating server like "
+"Ring now supports conference call hosting integrating server like "
 "features in a simple GUI."
 msgstr ""
 
@@ -912,7 +912,7 @@ msgstr "Quitter une conférence"
 
 #: sflphone.xml:529(para)
 msgid ""
-"SFLphone conference model let you leave a conference that you are currently "
+"Ring conference model let you leave a conference that you are currently "
 "hosting to answer any other incoming communication or even initiate new "
 "ones. The conference is not interupted Double clicking the conference icon "
 "let you reintroduce the conference."
@@ -924,7 +924,7 @@ msgstr "Conférence multiple"
 
 #: sflphone.xml:539(para)
 msgid ""
-"SFLphone supports multiple conferences running simultaneously. Two "
+"Ring supports multiple conferences running simultaneously. Two "
 "conferences can be joined the same way they are created, dragging one on the "
 "other."
 msgstr ""
@@ -952,7 +952,7 @@ msgid "Codecs overview"
 msgstr "Présentation des codecs"
 
 #: sflphone.xml:583(para)
-msgid "SFLphone supports several widely used audio codec:"
+msgid "Ring supports several widely used audio codec:"
 msgstr "SFlphone supporte de nombreux codecs très populaires:"
 
 #: sflphone.xml:587(guilabel)
@@ -1036,11 +1036,11 @@ msgstr ""
 #: sflphone.xml:645(para)
 msgid ""
 "Every address books you configured in Evolution will be now available in "
-"<application>SFLphone</application>. Please be sure you selected at least "
+"<application>Ring</application>. Please be sure you selected at least "
 "one address book."
 msgstr ""
 "Tous les carnets d'adresse configurés dans Evolution sont accessibles dans "
-"<application>SFLphone</application>. Attention à bien vérifier que au moins "
+"<application>Ring</application>. Attention à bien vérifier que au moins "
 "un carnet d'adresse est sélectionné."
 
 #: sflphone.xml:649(title)
@@ -1191,10 +1191,10 @@ msgstr "Popup la fenêtre principale lors de l'arrivée d'un appel"
 
 #: sflphone.xml:785(para)
 msgid ""
-"If SFLphone is closed on the system tray, pops the main window up on "
+"If Ring is closed on the system tray, pops the main window up on "
 "foreground when receiving an incoming call."
 msgstr ""
-"Si SFLphone est réduit dans la barre des tâches, faire apparaître la fenêtre "
+"Si Ring est réduit dans la barre des tâches, faire apparaître la fenêtre "
 "principale sur les appels entrants."
 
 #: sflphone.xml:790(guilabel)
@@ -1203,19 +1203,19 @@ msgstr "Ne jamais faire apparaître la fenêtre principale"
 
 #: sflphone.xml:791(para)
 msgid ""
-"If SFLphone is closed on the system tray, never pops the main window up on "
+"If Ring is closed on the system tray, never pops the main window up on "
 "foreground when receiving an incoming call."
 msgstr ""
-"Si SFLphone est réduit dans la barre des tâches, ne jamais ouvrir la fenêtre "
+"Si Ring est réduit dans la barre des tâches, ne jamais ouvrir la fenêtre "
 "au premier plan sur les appels entrants."
 
 #: sflphone.xml:796(guilabel)
-msgid "Hide SFLphone window on startup"
-msgstr "Cacher SFLphone au démarrage"
+msgid "Hide Ring window on startup"
+msgstr "Cacher Ring au démarrage"
 
 #: sflphone.xml:797(para)
-msgid "On startup, SFLphone will go directly on the system tray."
-msgstr "Au démarrage, SFLphone se met directement dans la barre des tâches."
+msgid "On startup, Ring will go directly on the system tray."
+msgstr "Au démarrage, Ring se met directement dans la barre des tâches."
 
 #: sflphone.xml:810(title)
 msgid "Calls history options"
diff --git a/gnome/man/Makefile.am b/gnome/man/Makefile.am
index 6cbde49b8d..3d9c8f2794 100644
--- a/gnome/man/Makefile.am
+++ b/gnome/man/Makefile.am
@@ -1,9 +1,9 @@
 SECTION="1"
 
-TEMPLATES=sflphone-client-gnome.pod
+TEMPLATES=ring-client-gnome.pod
 
-man_MANS = sflphone-client-gnome.1 \
-           sflphone.1
+man_MANS = ring-client-gnome.1 \
+           ring.1
 
 POD2MAN=pod2man
 
diff --git a/gnome/man/ring-client-gnome.pod b/gnome/man/ring-client-gnome.pod
new file mode 100644
index 0000000000..3ee96d962e
--- /dev/null
+++ b/gnome/man/ring-client-gnome.pod
@@ -0,0 +1,38 @@
+=head1 NAME
+
+ring-client-gnome - SIP and IAX2 compatible voice over IP softphone GTK+ client.
+
+=head1 SYNOPSIS
+
+ring-client-gnome
+
+=head1 DESCRIPTION
+
+Ring is meant to be a robust enterprise-class desktop phone. It provides functions like call transfer, call hold, multiple lines, multiple accounts support.
+Ring audio layer is build upon a native ALSA interface and and a native PulseAudio interface.
+B<ring-client-gnome> is a GTK+ client for Ring; it communicates with the core side through DBus. Ring package comes with the core, B<ringd>.
+
+=head1 BUGS
+
+Please report bugs at https://projects.savoirfairelinux.com/projects/sflphone/issues/new.
+
+=head1 AUTHORS
+
+B<ring-client-gnome> is developed in Montreal by Savoir-Faire Linux Inc.
+
+This manual page was written by Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>.
+
+=head1 SEE ALSO
+
+B<ringd>(1)
+
+=head1 COPYRIGHT
+
+This program is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License version 3 as published by the
+Free Software Foundation.
+
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+=cut
diff --git a/gnome/man/ring.pod b/gnome/man/ring.pod
new file mode 120000
index 0000000000..4bf7ff3b9f
--- /dev/null
+++ b/gnome/man/ring.pod
@@ -0,0 +1 @@
+ring-client-gnome.pod
\ No newline at end of file
diff --git a/gnome/man/sflphone-client-gnome.pod b/gnome/man/sflphone-client-gnome.pod
deleted file mode 100644
index 284aad9cc0..0000000000
--- a/gnome/man/sflphone-client-gnome.pod
+++ /dev/null
@@ -1,39 +0,0 @@
-=head1 NAME
-
-sflphone-client-gnome - SIP and IAX2 compatible voice over IP softphone GTK+ client.
-
-=head1 SYNOPSIS
-
-sflphone-client-gnome
-
-=head1 DESCRIPTION
-
-SFLphone is meant to be a robust enterprise-class desktop phone. It provides functions like call transfer, call hold, multiple lines, multiple accounts support.
-SFLphone audio layer is build upon a native ALSA interface and and a native PulseAudio interface.
-B<sflphone-client-gnome> is a GTK+ client for SFLphone; it communicates with the core side through DBus. SFLphone package comes with the core, B<sflphoned>.
-
-=head1 BUGS
-
-Please report bugs at https://projects.savoirfairelinux.com/projects/sflphone/issues/new.
-
-=head1 AUTHORS
-
-B<sflphone-client-gnome> is developed in Montreal by Savoir-Faire Linux Inc.
-
-This manual page was written by Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>.
-
-=head1 SEE ALSO
-
-B<sflphoned>(1)
-
-=head1 COPYRIGHT
-
-This program is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License version 3 as published by the
-Free Software Foundation.
-
-On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
-
-=cut
-
diff --git a/gnome/man/sflphone.pod b/gnome/man/sflphone.pod
deleted file mode 120000
index 40e241fa81..0000000000
--- a/gnome/man/sflphone.pod
+++ /dev/null
@@ -1 +0,0 @@
-sflphone-client-gnome.pod
\ No newline at end of file
diff --git a/gnome/po/POTFILES.in b/gnome/po/POTFILES.in
index d02407c0d9..6af2d51f27 100644
--- a/gnome/po/POTFILES.in
+++ b/gnome/po/POTFILES.in
@@ -21,11 +21,11 @@ src/dbus/dbus.c
 src/main.c
 src/mainwindow.c
 src/presencewindow.c
-src/sflphone_client.c
-src/sflphone_options.c
+src/ring_client.c
+src/ring_options.c
 src/sflnotify.c
 src/sliders.c
 src/statusicon.c
 src/uimanager.c
 src/video/video_callbacks.c
-src/sflphone_menus.ui
+src/ring_menus.ui
diff --git a/gnome/po/ab.po b/gnome/po/ab.po
index 8860fd86d0..7b17ba5fdf 100644
--- a/gnome/po/ab.po
+++ b/gnome/po/ab.po
@@ -523,7 +523,7 @@ msgid "None"
 msgstr "Denguna"
 
 #: ../src/config/assistant.c:241
-msgid "Welcome to the account registration wizard for SFLphone!"
+msgid "Welcome to the account registration wizard for Ring!"
 msgstr ""
 
 #: ../src/config/assistant.c:242
@@ -590,7 +590,7 @@ msgid "Congratulations!"
 msgstr "¡Norabona!"
 
 #: ../src/config/assistant.c:561
-msgid "SFLphone account registration wizard"
+msgid "Ring account registration wizard"
 msgstr ""
 
 #: ../src/config/audioconf.c:504
@@ -733,7 +733,7 @@ msgid "Window Behaviour"
 msgstr ""
 
 #: ../src/config/preferencesdialog.c:195
-msgid "Bring SFLphone to foreground on incoming calls"
+msgid "Bring Ring to foreground on incoming calls"
 msgstr ""
 
 #. System Tray option frame
@@ -742,8 +742,8 @@ msgid "System Tray Icon (Legacy)"
 msgstr ""
 
 #: ../src/config/preferencesdialog.c:209
-msgid "Show SFLphone in the system tray"
-msgstr "Amosar SFLphone na bandexa del sistema"
+msgid "Show Ring in the system tray"
+msgstr "Amosar Ring na bandexa del sistema"
 
 #: ../src/config/preferencesdialog.c:215
 msgid "_Popup main window on incoming call"
@@ -1111,17 +1111,17 @@ msgid "Status:"
 msgstr ""
 
 #: ../src/presencewindow.c:1168
-msgid "SFLphone Presence"
+msgid "Ring Presence"
 msgstr ""
 
-#: ../src/sflphone_client.c:60
+#: ../src/ring_client.c:60
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 
-#: ../src/sflphone_client.c:79
+#: ../src/ring_client.c:79
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -1129,16 +1129,16 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: ../src/sflphone_client.c:82
-msgid "SFLphone Error"
-msgstr "Error SFLphone"
+#: ../src/ring_client.c:82
+msgid "Ring Error"
+msgstr "Error Ring"
 
-#: ../src/sflphone_options.c:60
+#: ../src/ring_options.c:60
 msgid "Enable debug"
 msgstr ""
 
-#: ../src/sflphone_options.c:67
-msgid "- GNOME client for SFLPhone"
+#: ../src/ring_options.c:67
+msgid "- GNOME client for Ring"
 msgstr ""
 
 #: ../src/sflnotify.c:94
@@ -1236,8 +1236,8 @@ msgid "_Hang up"
 msgstr "_Colgar"
 
 #: ../src/statusicon.c:190
-msgid "SFLphone"
-msgstr "SFLphone"
+msgid "Ring"
+msgstr "Ring"
 
 #: ../src/uimanager.c:457
 msgid "No address book selected"
@@ -1253,13 +1253,13 @@ msgid "Voicemail(%i)"
 msgstr ""
 
 #: ../src/uimanager.c:602
-msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
+msgid "Ring is a VoIP client compatible with SIP and IAX2 protocols."
 msgstr ""
-"SFLphone ye un programa de VoIP compatible colos protocolos SIP ya IAX2."
+"Ring ye un programa de VoIP compatible colos protocolos SIP ya IAX2."
 
 #: ../src/uimanager.c:605
-msgid "About SFLphone"
-msgstr "Tocante a SFLphone"
+msgid "About Ring"
+msgstr "Tocante a Ring"
 
 #: ../src/uimanager.c:718
 msgid "_Cancel"
diff --git a/gnome/po/ar.po b/gnome/po/ar.po
index 7d487d00ab..b8ed14d17b 100644
--- a/gnome/po/ar.po
+++ b/gnome/po/ar.po
@@ -523,7 +523,7 @@ msgid "None"
 msgstr "لا شيئ"
 
 #: ../src/config/assistant.c:241
-msgid "Welcome to the account registration wizard for SFLphone!"
+msgid "Welcome to the account registration wizard for Ring!"
 msgstr ""
 
 #: ../src/config/assistant.c:242
@@ -590,7 +590,7 @@ msgid "Congratulations!"
 msgstr "تهانينا!"
 
 #: ../src/config/assistant.c:561
-msgid "SFLphone account registration wizard"
+msgid "Ring account registration wizard"
 msgstr ""
 
 #: ../src/config/audioconf.c:504
@@ -733,8 +733,8 @@ msgid "Window Behaviour"
 msgstr "تصرف النافذة"
 
 #: ../src/config/preferencesdialog.c:195
-msgid "Bring SFLphone to foreground on incoming calls"
-msgstr "جلب SFLphone للصدارة عند ورود مكالمات"
+msgid "Bring Ring to foreground on incoming calls"
+msgstr "جلب Ring للصدارة عند ورود مكالمات"
 
 #. System Tray option frame
 #: ../src/config/preferencesdialog.c:202
@@ -742,8 +742,8 @@ msgid "System Tray Icon (Legacy)"
 msgstr "أيقونة شريط المهام (موروث)"
 
 #: ../src/config/preferencesdialog.c:209
-msgid "Show SFLphone in the system tray"
-msgstr "إظهار SFLphone في شريط المهام"
+msgid "Show Ring in the system tray"
+msgstr "إظهار Ring في شريط المهام"
 
 #: ../src/config/preferencesdialog.c:215
 msgid "_Popup main window on incoming call"
@@ -1109,10 +1109,10 @@ msgid "Status:"
 msgstr "الحالة:"
 
 #: ../src/presencewindow.c:1168
-msgid "SFLphone Presence"
-msgstr "حالة التواجد على SFLphone"
+msgid "Ring Presence"
+msgstr "حالة التواجد على Ring"
 
-#: ../src/sflphone_client.c:60
+#: ../src/ring_client.c:60
 #, c-format
 msgid ""
 "%s\n"
@@ -1122,7 +1122,7 @@ msgstr ""
 "شغّل الأمر '‎%s --help ' لرؤية القائمة الكاملة لخيارات الأوامر السطرية "
 "المتاحة.\n"
 
-#: ../src/sflphone_client.c:79
+#: ../src/ring_client.c:79
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -1130,17 +1130,17 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: ../src/sflphone_client.c:82
-msgid "SFLphone Error"
-msgstr "خطأ SFLphone"
+#: ../src/ring_client.c:82
+msgid "Ring Error"
+msgstr "خطأ Ring"
 
-#: ../src/sflphone_options.c:60
+#: ../src/ring_options.c:60
 msgid "Enable debug"
 msgstr "تفعيل التنقيح"
 
-#: ../src/sflphone_options.c:67
-msgid "- GNOME client for SFLPhone"
-msgstr "- مستخدم GNOME لدى SFLphone"
+#: ../src/ring_options.c:67
+msgid "- GNOME client for Ring"
+msgstr "- مستخدم GNOME لدى Ring"
 
 #: ../src/sflnotify.c:94
 #, c-format
@@ -1241,8 +1241,8 @@ msgid "_Hang up"
 msgstr "إ_نهاء المكالمة"
 
 #: ../src/statusicon.c:190
-msgid "SFLphone"
-msgstr "SFLphone"
+msgid "Ring"
+msgstr "Ring"
 
 #: ../src/uimanager.c:457
 msgid "No address book selected"
@@ -1258,14 +1258,14 @@ msgid "Voicemail(%i)"
 msgstr "البريد الصوتي (‎%i)"
 
 #: ../src/uimanager.c:602
-msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
+msgid "Ring is a VoIP client compatible with SIP and IAX2 protocols."
 msgstr ""
-"‏SFLphone‎ يستخدم الصوت عبر بروتوكول الإنترنت (‎VOIP)‏ وهو متلائم مع "
+"‏Ring‎ يستخدم الصوت عبر بروتوكول الإنترنت (‎VOIP)‏ وهو متلائم مع "
 "البروتوكول ‎SIP و IAX2"
 
 #: ../src/uimanager.c:605
-msgid "About SFLphone"
-msgstr "حول ‏SFLphone"
+msgid "About Ring"
+msgstr "حول ‏Ring"
 
 #: ../src/uimanager.c:718
 msgid "_Cancel"
diff --git a/gnome/po/ast.po b/gnome/po/ast.po
index 6cfdf64147..5143cadd1a 100644
--- a/gnome/po/ast.po
+++ b/gnome/po/ast.po
@@ -523,7 +523,7 @@ msgid "None"
 msgstr "Denguna"
 
 #: ../src/config/assistant.c:241
-msgid "Welcome to the account registration wizard for SFLphone!"
+msgid "Welcome to the account registration wizard for Ring!"
 msgstr ""
 
 #: ../src/config/assistant.c:242
@@ -590,7 +590,7 @@ msgid "Congratulations!"
 msgstr "¡Norabona!"
 
 #: ../src/config/assistant.c:561
-msgid "SFLphone account registration wizard"
+msgid "Ring account registration wizard"
 msgstr ""
 
 #: ../src/config/audioconf.c:504
@@ -733,8 +733,8 @@ msgid "Window Behaviour"
 msgstr "Comportamientu de la ventana"
 
 #: ../src/config/preferencesdialog.c:195
-msgid "Bring SFLphone to foreground on incoming calls"
-msgstr "Traer SFLphone a primer planu al recibir llamaes"
+msgid "Bring Ring to foreground on incoming calls"
+msgstr "Traer Ring a primer planu al recibir llamaes"
 
 #. System Tray option frame
 #: ../src/config/preferencesdialog.c:202
@@ -742,8 +742,8 @@ msgid "System Tray Icon (Legacy)"
 msgstr "Iconu de la Bandexa del Sistema (Anticuáu)"
 
 #: ../src/config/preferencesdialog.c:209
-msgid "Show SFLphone in the system tray"
-msgstr "Amosar SFLphone na bandexa del sistema"
+msgid "Show Ring in the system tray"
+msgstr "Amosar Ring na bandexa del sistema"
 
 #: ../src/config/preferencesdialog.c:215
 msgid "_Popup main window on incoming call"
@@ -1111,10 +1111,10 @@ msgid "Status:"
 msgstr "Estáu:"
 
 #: ../src/presencewindow.c:1168
-msgid "SFLphone Presence"
-msgstr "Presencia SFLphone"
+msgid "Ring Presence"
+msgstr "Presencia Ring"
 
-#: ../src/sflphone_client.c:60
+#: ../src/ring_client.c:60
 #, c-format
 msgid ""
 "%s\n"
@@ -1124,7 +1124,7 @@ msgstr ""
 "Executar '%s --help' pa ver una llista completa de les opciones de comandu "
 "disponibles.\n"
 
-#: ../src/sflphone_client.c:79
+#: ../src/ring_client.c:79
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -1132,17 +1132,17 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: ../src/sflphone_client.c:82
-msgid "SFLphone Error"
-msgstr "Error SFLphone"
+#: ../src/ring_client.c:82
+msgid "Ring Error"
+msgstr "Error Ring"
 
-#: ../src/sflphone_options.c:60
+#: ../src/ring_options.c:60
 msgid "Enable debug"
 msgstr "Activar depuración"
 
-#: ../src/sflphone_options.c:67
-msgid "- GNOME client for SFLPhone"
-msgstr "- cliente GNOME pa SFLPhone"
+#: ../src/ring_options.c:67
+msgid "- GNOME client for Ring"
+msgstr "- cliente GNOME pa Ring"
 
 #: ../src/sflnotify.c:94
 #, c-format
@@ -1239,8 +1239,8 @@ msgid "_Hang up"
 msgstr "_Colgar"
 
 #: ../src/statusicon.c:190
-msgid "SFLphone"
-msgstr "SFLphone"
+msgid "Ring"
+msgstr "Ring"
 
 #: ../src/uimanager.c:457
 msgid "No address book selected"
@@ -1256,13 +1256,13 @@ msgid "Voicemail(%i)"
 msgstr "Voicemail(%i)"
 
 #: ../src/uimanager.c:602
-msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
+msgid "Ring is a VoIP client compatible with SIP and IAX2 protocols."
 msgstr ""
-"SFLphone ye un programa de VoIP compatible colos protocolos SIP ya IAX2."
+"Ring ye un programa de VoIP compatible colos protocolos SIP ya IAX2."
 
 #: ../src/uimanager.c:605
-msgid "About SFLphone"
-msgstr "Tocante a SFLphone"
+msgid "About Ring"
+msgstr "Tocante a Ring"
 
 #: ../src/uimanager.c:718
 msgid "_Cancel"
diff --git a/gnome/po/ca.po b/gnome/po/ca.po
index 924abe8919..382489bd84 100644
--- a/gnome/po/ca.po
+++ b/gnome/po/ca.po
@@ -526,7 +526,7 @@ msgid "None"
 msgstr "Cap"
 
 #: ../src/config/assistant.c:241
-msgid "Welcome to the account registration wizard for SFLphone!"
+msgid "Welcome to the account registration wizard for Ring!"
 msgstr ""
 
 #: ../src/config/assistant.c:242
@@ -593,7 +593,7 @@ msgid "Congratulations!"
 msgstr "Enhorabona!"
 
 #: ../src/config/assistant.c:561
-msgid "SFLphone account registration wizard"
+msgid "Ring account registration wizard"
 msgstr ""
 
 #: ../src/config/audioconf.c:504
@@ -736,7 +736,7 @@ msgid "Window Behaviour"
 msgstr ""
 
 #: ../src/config/preferencesdialog.c:195
-msgid "Bring SFLphone to foreground on incoming calls"
+msgid "Bring Ring to foreground on incoming calls"
 msgstr ""
 
 #. System Tray option frame
@@ -745,8 +745,8 @@ msgid "System Tray Icon (Legacy)"
 msgstr ""
 
 #: ../src/config/preferencesdialog.c:209
-msgid "Show SFLphone in the system tray"
-msgstr "Mostra l'SFLPhone a l'àrea de notificació"
+msgid "Show Ring in the system tray"
+msgstr "Mostra l'Ring a l'àrea de notificació"
 
 #: ../src/config/preferencesdialog.c:215
 msgid "_Popup main window on incoming call"
@@ -1115,17 +1115,17 @@ msgid "Status:"
 msgstr ""
 
 #: ../src/presencewindow.c:1168
-msgid "SFLphone Presence"
+msgid "Ring Presence"
 msgstr ""
 
-#: ../src/sflphone_client.c:60
+#: ../src/ring_client.c:60
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 
-#: ../src/sflphone_client.c:79
+#: ../src/ring_client.c:79
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -1133,16 +1133,16 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: ../src/sflphone_client.c:82
-msgid "SFLphone Error"
-msgstr "Error de l'SFLphone"
+#: ../src/ring_client.c:82
+msgid "Ring Error"
+msgstr "Error de l'Ring"
 
-#: ../src/sflphone_options.c:60
+#: ../src/ring_options.c:60
 msgid "Enable debug"
 msgstr ""
 
-#: ../src/sflphone_options.c:67
-msgid "- GNOME client for SFLPhone"
+#: ../src/ring_options.c:67
+msgid "- GNOME client for Ring"
 msgstr ""
 
 #: ../src/sflnotify.c:94
@@ -1240,8 +1240,8 @@ msgid "_Hang up"
 msgstr "_Penja"
 
 #: ../src/statusicon.c:190
-msgid "SFLphone"
-msgstr "SFLphone"
+msgid "Ring"
+msgstr "Ring"
 
 #: ../src/uimanager.c:457
 msgid "No address book selected"
@@ -1257,13 +1257,13 @@ msgid "Voicemail(%i)"
 msgstr ""
 
 #: ../src/uimanager.c:602
-msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
+msgid "Ring is a VoIP client compatible with SIP and IAX2 protocols."
 msgstr ""
-"L'SFLphone és un client de VoIP compatible amb els protocols SIP i IAX2."
+"L'Ring és un client de VoIP compatible amb els protocols SIP i IAX2."
 
 #: ../src/uimanager.c:605
-msgid "About SFLphone"
-msgstr "Quant al SFLphone"
+msgid "About Ring"
+msgstr "Quant al Ring"
 
 #: ../src/uimanager.c:718
 msgid "_Cancel"
diff --git a/gnome/po/cs.po b/gnome/po/cs.po
index bc6fe84022..34b727494b 100644
--- a/gnome/po/cs.po
+++ b/gnome/po/cs.po
@@ -526,7 +526,7 @@ msgid "None"
 msgstr "Žádný"
 
 #: ../src/config/assistant.c:241
-msgid "Welcome to the account registration wizard for SFLphone!"
+msgid "Welcome to the account registration wizard for Ring!"
 msgstr ""
 
 #: ../src/config/assistant.c:242
@@ -593,7 +593,7 @@ msgid "Congratulations!"
 msgstr "Blahopřání!"
 
 #: ../src/config/assistant.c:561
-msgid "SFLphone account registration wizard"
+msgid "Ring account registration wizard"
 msgstr ""
 
 #: ../src/config/audioconf.c:504
@@ -736,8 +736,8 @@ msgid "Window Behaviour"
 msgstr "Chování okna"
 
 #: ../src/config/preferencesdialog.c:195
-msgid "Bring SFLphone to foreground on incoming calls"
-msgstr "Přenést SFLphone při příchozích hovorech do popředí"
+msgid "Bring Ring to foreground on incoming calls"
+msgstr "Přenést Ring při příchozích hovorech do popředí"
 
 #. System Tray option frame
 #: ../src/config/preferencesdialog.c:202
@@ -745,8 +745,8 @@ msgid "System Tray Icon (Legacy)"
 msgstr "Ikona v oznamovací oblasti panelu (dědictví)"
 
 #: ../src/config/preferencesdialog.c:209
-msgid "Show SFLphone in the system tray"
-msgstr "Ukazovat SFLphone v systémové části panelu"
+msgid "Show Ring in the system tray"
+msgstr "Ukazovat Ring v systémové části panelu"
 
 #: ../src/config/preferencesdialog.c:215
 msgid "_Popup main window on incoming call"
@@ -1112,10 +1112,10 @@ msgid "Status:"
 msgstr "Stav:"
 
 #: ../src/presencewindow.c:1168
-msgid "SFLphone Presence"
-msgstr "Přítomnost SFLphone"
+msgid "Ring Presence"
+msgstr "Přítomnost Ring"
 
-#: ../src/sflphone_client.c:60
+#: ../src/ring_client.c:60
 #, c-format
 msgid ""
 "%s\n"
@@ -1125,7 +1125,7 @@ msgstr ""
 "Spusťte „%s --help“ pro zobrazení úplného seznamu dostupných přepínačů "
 "příkazového řádku.\n"
 
-#: ../src/sflphone_client.c:79
+#: ../src/ring_client.c:79
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -1133,17 +1133,17 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: ../src/sflphone_client.c:82
-msgid "SFLphone Error"
-msgstr "Chyba SFLphone"
+#: ../src/ring_client.c:82
+msgid "Ring Error"
+msgstr "Chyba Ring"
 
-#: ../src/sflphone_options.c:60
+#: ../src/ring_options.c:60
 msgid "Enable debug"
 msgstr "Povolit ladění"
 
-#: ../src/sflphone_options.c:67
-msgid "- GNOME client for SFLPhone"
-msgstr "- GNOME klient pro SFLPhone"
+#: ../src/ring_options.c:67
+msgid "- GNOME client for Ring"
+msgstr "- GNOME klient pro Ring"
 
 #: ../src/sflnotify.c:94
 #, c-format
@@ -1240,8 +1240,8 @@ msgid "_Hang up"
 msgstr "_Zavěsit"
 
 #: ../src/statusicon.c:190
-msgid "SFLphone"
-msgstr "SFLphone"
+msgid "Ring"
+msgstr "Ring"
 
 #: ../src/uimanager.c:457
 msgid "No address book selected"
@@ -1257,12 +1257,12 @@ msgid "Voicemail(%i)"
 msgstr "Hlasová schránka (%i)"
 
 #: ../src/uimanager.c:602
-msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
-msgstr "SFLphone je klient VoIP slučitelný s protokoly SIP a IAX2."
+msgid "Ring is a VoIP client compatible with SIP and IAX2 protocols."
+msgstr "Ring je klient VoIP slučitelný s protokoly SIP a IAX2."
 
 #: ../src/uimanager.c:605
-msgid "About SFLphone"
-msgstr "O programu SFLphone"
+msgid "About Ring"
+msgstr "O programu Ring"
 
 #: ../src/uimanager.c:718
 msgid "_Cancel"
diff --git a/gnome/po/da.po b/gnome/po/da.po
index 741d63a32f..df977d8d66 100644
--- a/gnome/po/da.po
+++ b/gnome/po/da.po
@@ -524,7 +524,7 @@ msgid "None"
 msgstr "Ingen"
 
 #: ../src/config/assistant.c:241
-msgid "Welcome to the account registration wizard for SFLphone!"
+msgid "Welcome to the account registration wizard for Ring!"
 msgstr ""
 
 #: ../src/config/assistant.c:242
@@ -591,7 +591,7 @@ msgid "Congratulations!"
 msgstr "Tillykke!"
 
 #: ../src/config/assistant.c:561
-msgid "SFLphone account registration wizard"
+msgid "Ring account registration wizard"
 msgstr ""
 
 #: ../src/config/audioconf.c:504
@@ -734,7 +734,7 @@ msgid "Window Behaviour"
 msgstr ""
 
 #: ../src/config/preferencesdialog.c:195
-msgid "Bring SFLphone to foreground on incoming calls"
+msgid "Bring Ring to foreground on incoming calls"
 msgstr ""
 
 #. System Tray option frame
@@ -743,8 +743,8 @@ msgid "System Tray Icon (Legacy)"
 msgstr ""
 
 #: ../src/config/preferencesdialog.c:209
-msgid "Show SFLphone in the system tray"
-msgstr "Vis SFLphone i systemfeltet"
+msgid "Show Ring in the system tray"
+msgstr "Vis Ring i systemfeltet"
 
 #: ../src/config/preferencesdialog.c:215
 msgid "_Popup main window on incoming call"
@@ -1112,17 +1112,17 @@ msgid "Status:"
 msgstr ""
 
 #: ../src/presencewindow.c:1168
-msgid "SFLphone Presence"
+msgid "Ring Presence"
 msgstr ""
 
-#: ../src/sflphone_client.c:60
+#: ../src/ring_client.c:60
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 
-#: ../src/sflphone_client.c:79
+#: ../src/ring_client.c:79
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -1130,16 +1130,16 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: ../src/sflphone_client.c:82
-msgid "SFLphone Error"
-msgstr "SFLphone fejl"
+#: ../src/ring_client.c:82
+msgid "Ring Error"
+msgstr "Ring fejl"
 
-#: ../src/sflphone_options.c:60
+#: ../src/ring_options.c:60
 msgid "Enable debug"
 msgstr ""
 
-#: ../src/sflphone_options.c:67
-msgid "- GNOME client for SFLPhone"
+#: ../src/ring_options.c:67
+msgid "- GNOME client for Ring"
 msgstr ""
 
 #: ../src/sflnotify.c:94
@@ -1237,8 +1237,8 @@ msgid "_Hang up"
 msgstr "_Læg på"
 
 #: ../src/statusicon.c:190
-msgid "SFLphone"
-msgstr "SFLphone"
+msgid "Ring"
+msgstr "Ring"
 
 #: ../src/uimanager.c:457
 msgid "No address book selected"
@@ -1254,12 +1254,12 @@ msgid "Voicemail(%i)"
 msgstr ""
 
 #: ../src/uimanager.c:602
-msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
-msgstr "SFLphone er en VoIP-klient kompatibel med SIP og IAX2 protokoller"
+msgid "Ring is a VoIP client compatible with SIP and IAX2 protocols."
+msgstr "Ring er en VoIP-klient kompatibel med SIP og IAX2 protokoller"
 
 #: ../src/uimanager.c:605
-msgid "About SFLphone"
-msgstr "Om SFLphone"
+msgid "About Ring"
+msgstr "Om Ring"
 
 #: ../src/uimanager.c:718
 msgid "_Cancel"
diff --git a/gnome/po/de.po b/gnome/po/de.po
index 829ca85eae..243a310518 100644
--- a/gnome/po/de.po
+++ b/gnome/po/de.po
@@ -1,4 +1,4 @@
-# German translation of SFLphone.
+# German translation of Ring.
 # Copyright (C) 2008 The Free Software Foundation, Inc.
 # This file is distributed under the GNU General Public License Version 3.
 #
@@ -524,7 +524,7 @@ msgid "None"
 msgstr "Nichts"
 
 #: ../src/config/assistant.c:241
-msgid "Welcome to the account registration wizard for SFLphone!"
+msgid "Welcome to the account registration wizard for Ring!"
 msgstr ""
 
 #: ../src/config/assistant.c:242
@@ -592,7 +592,7 @@ msgid "Congratulations!"
 msgstr "Gratulation!"
 
 #: ../src/config/assistant.c:561
-msgid "SFLphone account registration wizard"
+msgid "Ring account registration wizard"
 msgstr ""
 
 #: ../src/config/audioconf.c:504
@@ -735,8 +735,8 @@ msgid "Window Behaviour"
 msgstr "Fensterverhalten"
 
 #: ../src/config/preferencesdialog.c:195
-msgid "Bring SFLphone to foreground on incoming calls"
-msgstr "SFLphone bei eingehenden Anrufen in den Vordergrund holen"
+msgid "Bring Ring to foreground on incoming calls"
+msgstr "Ring bei eingehenden Anrufen in den Vordergrund holen"
 
 #. System Tray option frame
 #: ../src/config/preferencesdialog.c:202
@@ -744,8 +744,8 @@ msgid "System Tray Icon (Legacy)"
 msgstr "Systemleistensymbol (veraltet)"
 
 #: ../src/config/preferencesdialog.c:209
-msgid "Show SFLphone in the system tray"
-msgstr "SFLphone im Infobereich anzeigen"
+msgid "Show Ring in the system tray"
+msgstr "Ring im Infobereich anzeigen"
 
 #: ../src/config/preferencesdialog.c:215
 msgid "_Popup main window on incoming call"
@@ -1113,10 +1113,10 @@ msgid "Status:"
 msgstr "Status:"
 
 #: ../src/presencewindow.c:1168
-msgid "SFLphone Presence"
-msgstr "SFLphone Anwesenheit"
+msgid "Ring Presence"
+msgstr "Ring Anwesenheit"
 
-#: ../src/sflphone_client.c:60
+#: ../src/ring_client.c:60
 #, c-format
 msgid ""
 "%s\n"
@@ -1126,7 +1126,7 @@ msgstr ""
 "Rufen Sie »%s --help« auf, um eine vollständige Liste der verfügbaren\n"
 "Befehlszeilenoptionen zu erhalten.\n"
 
-#: ../src/sflphone_client.c:79
+#: ../src/ring_client.c:79
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -1134,17 +1134,17 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: ../src/sflphone_client.c:82
-msgid "SFLphone Error"
-msgstr "SFLphone-Fehler"
+#: ../src/ring_client.c:82
+msgid "Ring Error"
+msgstr "Ring-Fehler"
 
-#: ../src/sflphone_options.c:60
+#: ../src/ring_options.c:60
 msgid "Enable debug"
 msgstr "Debug aktivieren"
 
-#: ../src/sflphone_options.c:67
-msgid "- GNOME client for SFLPhone"
-msgstr "- GNOME Anwendung für SFLphone"
+#: ../src/ring_options.c:67
+msgid "- GNOME client for Ring"
+msgstr "- GNOME Anwendung für Ring"
 
 #: ../src/sflnotify.c:94
 #, c-format
@@ -1241,8 +1241,8 @@ msgid "_Hang up"
 msgstr "A_uflegen"
 
 #: ../src/statusicon.c:190
-msgid "SFLphone"
-msgstr "SFLphone"
+msgid "Ring"
+msgstr "Ring"
 
 #: ../src/uimanager.c:457
 msgid "No address book selected"
@@ -1258,12 +1258,12 @@ msgid "Voicemail(%i)"
 msgstr "Voicemail (%i)"
 
 #: ../src/uimanager.c:602
-msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
-msgstr "SFLphone ist ein VoIP-Client kompatibel zu SIP und IAX2."
+msgid "Ring is a VoIP client compatible with SIP and IAX2 protocols."
+msgstr "Ring ist ein VoIP-Client kompatibel zu SIP und IAX2."
 
 #: ../src/uimanager.c:605
-msgid "About SFLphone"
-msgstr "Über SFLphone"
+msgid "About Ring"
+msgstr "Über Ring"
 
 #: ../src/uimanager.c:718
 msgid "_Cancel"
diff --git a/gnome/po/el.po b/gnome/po/el.po
index 0900a4cd71..177ff6827d 100644
--- a/gnome/po/el.po
+++ b/gnome/po/el.po
@@ -518,7 +518,7 @@ msgid "None"
 msgstr ""
 
 #: ../src/config/assistant.c:241
-msgid "Welcome to the account registration wizard for SFLphone!"
+msgid "Welcome to the account registration wizard for Ring!"
 msgstr ""
 
 #: ../src/config/assistant.c:242
@@ -585,7 +585,7 @@ msgid "Congratulations!"
 msgstr ""
 
 #: ../src/config/assistant.c:561
-msgid "SFLphone account registration wizard"
+msgid "Ring account registration wizard"
 msgstr ""
 
 #: ../src/config/audioconf.c:504
@@ -728,7 +728,7 @@ msgid "Window Behaviour"
 msgstr ""
 
 #: ../src/config/preferencesdialog.c:195
-msgid "Bring SFLphone to foreground on incoming calls"
+msgid "Bring Ring to foreground on incoming calls"
 msgstr ""
 
 #. System Tray option frame
@@ -737,7 +737,7 @@ msgid "System Tray Icon (Legacy)"
 msgstr ""
 
 #: ../src/config/preferencesdialog.c:209
-msgid "Show SFLphone in the system tray"
+msgid "Show Ring in the system tray"
 msgstr ""
 
 #: ../src/config/preferencesdialog.c:215
@@ -1101,17 +1101,17 @@ msgid "Status:"
 msgstr ""
 
 #: ../src/presencewindow.c:1168
-msgid "SFLphone Presence"
+msgid "Ring Presence"
 msgstr ""
 
-#: ../src/sflphone_client.c:60
+#: ../src/ring_client.c:60
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 
-#: ../src/sflphone_client.c:79
+#: ../src/ring_client.c:79
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -1119,16 +1119,16 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: ../src/sflphone_client.c:82
-msgid "SFLphone Error"
-msgstr "Σφάλμα SFLphone"
+#: ../src/ring_client.c:82
+msgid "Ring Error"
+msgstr "Σφάλμα Ring"
 
-#: ../src/sflphone_options.c:60
+#: ../src/ring_options.c:60
 msgid "Enable debug"
 msgstr ""
 
-#: ../src/sflphone_options.c:67
-msgid "- GNOME client for SFLPhone"
+#: ../src/ring_options.c:67
+msgid "- GNOME client for Ring"
 msgstr ""
 
 #: ../src/sflnotify.c:94
@@ -1226,8 +1226,8 @@ msgid "_Hang up"
 msgstr "Κλείστο _Η"
 
 #: ../src/statusicon.c:190
-msgid "SFLphone"
-msgstr "SFLphone"
+msgid "Ring"
+msgstr "Ring"
 
 #: ../src/uimanager.c:457
 msgid "No address book selected"
@@ -1243,14 +1243,14 @@ msgid "Voicemail(%i)"
 msgstr ""
 
 #: ../src/uimanager.c:602
-msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
+msgid "Ring is a VoIP client compatible with SIP and IAX2 protocols."
 msgstr ""
-"Το SFLphone ειναι ένα προγραμμα πελάτης VoIP συμβατό με SIP και ΙΑΧ2 "
+"Το Ring ειναι ένα προγραμμα πελάτης VoIP συμβατό με SIP και ΙΑΧ2 "
 "πρωτόκολλα"
 
 #: ../src/uimanager.c:605
-msgid "About SFLphone"
-msgstr "Σχετικά με το SFLphone"
+msgid "About Ring"
+msgstr "Σχετικά με το Ring"
 
 #: ../src/uimanager.c:718
 msgid "_Cancel"
diff --git a/gnome/po/es.po b/gnome/po/es.po
index 8d95736dda..7f1fe9fecd 100644
--- a/gnome/po/es.po
+++ b/gnome/po/es.po
@@ -1,4 +1,4 @@
-# Spanish translation of SFLphone.
+# Spanish translation of Ring.
 # Copyright (C) 2008 2009 The Free Software Foundation, Inc.
 # This file is distributed under the GNU General Public License Version 3.
 #
@@ -7,7 +7,7 @@
 # POT-Creation-Date: 2007-01-13 01:39+0100\n
 msgid ""
 msgstr ""
-"Project-Id-Version: SFLphone 0.9.4\n"
+"Project-Id-Version: Ring 0.9.4\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-07-14 21:27-0400\n"
 "PO-Revision-Date: 2014-04-02 03:19+0000\n"
@@ -528,7 +528,7 @@ msgid "None"
 msgstr "Ninguno"
 
 #: ../src/config/assistant.c:241
-msgid "Welcome to the account registration wizard for SFLphone!"
+msgid "Welcome to the account registration wizard for Ring!"
 msgstr ""
 
 #: ../src/config/assistant.c:242
@@ -596,7 +596,7 @@ msgid "Congratulations!"
 msgstr "¡Enhorabuena!"
 
 #: ../src/config/assistant.c:561
-msgid "SFLphone account registration wizard"
+msgid "Ring account registration wizard"
 msgstr ""
 
 #: ../src/config/audioconf.c:504
@@ -739,7 +739,7 @@ msgid "Window Behaviour"
 msgstr "Comportamiento de la ventana"
 
 #: ../src/config/preferencesdialog.c:195
-msgid "Bring SFLphone to foreground on incoming calls"
+msgid "Bring Ring to foreground on incoming calls"
 msgstr "Posicionar en primer plano al recibir unallamada"
 
 #. System Tray option frame
@@ -748,8 +748,8 @@ msgid "System Tray Icon (Legacy)"
 msgstr "Icono en la barra de notificacion"
 
 #: ../src/config/preferencesdialog.c:209
-msgid "Show SFLphone in the system tray"
-msgstr "Mostrar SFLphone en la barra de tareas"
+msgid "Show Ring in the system tray"
+msgstr "Mostrar Ring en la barra de tareas"
 
 #: ../src/config/preferencesdialog.c:215
 msgid "_Popup main window on incoming call"
@@ -1119,10 +1119,10 @@ msgid "Status:"
 msgstr "Estado:"
 
 #: ../src/presencewindow.c:1168
-msgid "SFLphone Presence"
-msgstr "Presencia SFLphone"
+msgid "Ring Presence"
+msgstr "Presencia Ring"
 
-#: ../src/sflphone_client.c:60
+#: ../src/ring_client.c:60
 #, c-format
 msgid ""
 "%s\n"
@@ -1132,7 +1132,7 @@ msgstr ""
 "Ejecuta '%s --help' para ver la lista completa de opciones de línea de "
 "comando disponibles.\n"
 
-#: ../src/sflphone_client.c:79
+#: ../src/ring_client.c:79
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -1140,17 +1140,17 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: ../src/sflphone_client.c:82
-msgid "SFLphone Error"
-msgstr "Error de SFLphone"
+#: ../src/ring_client.c:82
+msgid "Ring Error"
+msgstr "Error de Ring"
 
-#: ../src/sflphone_options.c:60
+#: ../src/ring_options.c:60
 msgid "Enable debug"
 msgstr "Habilitar el modo de depuración de errores"
 
-#: ../src/sflphone_options.c:67
-msgid "- GNOME client for SFLPhone"
-msgstr "- clientes GNOME para SFLPhone"
+#: ../src/ring_options.c:67
+msgid "- GNOME client for Ring"
+msgstr "- clientes GNOME para Ring"
 
 #: ../src/sflnotify.c:94
 #, c-format
@@ -1247,8 +1247,8 @@ msgid "_Hang up"
 msgstr "_Colgar"
 
 #: ../src/statusicon.c:190
-msgid "SFLphone"
-msgstr "SFLphone"
+msgid "Ring"
+msgstr "Ring"
 
 #: ../src/uimanager.c:457
 msgid "No address book selected"
@@ -1264,12 +1264,12 @@ msgid "Voicemail(%i)"
 msgstr "Mensaje de voz(%i)"
 
 #: ../src/uimanager.c:602
-msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
-msgstr "SFLphone es un cliente VoIP compatible con los protocolos SIP e IAX2"
+msgid "Ring is a VoIP client compatible with SIP and IAX2 protocols."
+msgstr "Ring es un cliente VoIP compatible con los protocolos SIP e IAX2"
 
 #: ../src/uimanager.c:605
-msgid "About SFLphone"
-msgstr "Acerca de SFLphone"
+msgid "About Ring"
+msgstr "Acerca de Ring"
 
 #: ../src/uimanager.c:718
 msgid "_Cancel"
diff --git a/gnome/po/et.po b/gnome/po/et.po
index edf4492390..d6d60d72bc 100644
--- a/gnome/po/et.po
+++ b/gnome/po/et.po
@@ -517,7 +517,7 @@ msgid "None"
 msgstr ""
 
 #: ../src/config/assistant.c:241
-msgid "Welcome to the account registration wizard for SFLphone!"
+msgid "Welcome to the account registration wizard for Ring!"
 msgstr ""
 
 #: ../src/config/assistant.c:242
@@ -584,7 +584,7 @@ msgid "Congratulations!"
 msgstr ""
 
 #: ../src/config/assistant.c:561
-msgid "SFLphone account registration wizard"
+msgid "Ring account registration wizard"
 msgstr ""
 
 #: ../src/config/audioconf.c:504
@@ -727,7 +727,7 @@ msgid "Window Behaviour"
 msgstr ""
 
 #: ../src/config/preferencesdialog.c:195
-msgid "Bring SFLphone to foreground on incoming calls"
+msgid "Bring Ring to foreground on incoming calls"
 msgstr ""
 
 #. System Tray option frame
@@ -736,7 +736,7 @@ msgid "System Tray Icon (Legacy)"
 msgstr ""
 
 #: ../src/config/preferencesdialog.c:209
-msgid "Show SFLphone in the system tray"
+msgid "Show Ring in the system tray"
 msgstr ""
 
 #: ../src/config/preferencesdialog.c:215
@@ -1095,17 +1095,17 @@ msgid "Status:"
 msgstr ""
 
 #: ../src/presencewindow.c:1168
-msgid "SFLphone Presence"
+msgid "Ring Presence"
 msgstr ""
 
-#: ../src/sflphone_client.c:60
+#: ../src/ring_client.c:60
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 
-#: ../src/sflphone_client.c:79
+#: ../src/ring_client.c:79
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -1113,16 +1113,16 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: ../src/sflphone_client.c:82
-msgid "SFLphone Error"
+#: ../src/ring_client.c:82
+msgid "Ring Error"
 msgstr ""
 
-#: ../src/sflphone_options.c:60
+#: ../src/ring_options.c:60
 msgid "Enable debug"
 msgstr ""
 
-#: ../src/sflphone_options.c:67
-msgid "- GNOME client for SFLPhone"
+#: ../src/ring_options.c:67
+msgid "- GNOME client for Ring"
 msgstr ""
 
 #: ../src/sflnotify.c:94
@@ -1220,7 +1220,7 @@ msgid "_Hang up"
 msgstr ""
 
 #: ../src/statusicon.c:190
-msgid "SFLphone"
+msgid "Ring"
 msgstr ""
 
 #: ../src/uimanager.c:457
@@ -1237,11 +1237,11 @@ msgid "Voicemail(%i)"
 msgstr ""
 
 #: ../src/uimanager.c:602
-msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
+msgid "Ring is a VoIP client compatible with SIP and IAX2 protocols."
 msgstr ""
 
 #: ../src/uimanager.c:605
-msgid "About SFLphone"
+msgid "About Ring"
 msgstr ""
 
 #: ../src/uimanager.c:718
diff --git a/gnome/po/fa.po b/gnome/po/fa.po
index ab7b867caa..cd74af26ba 100644
--- a/gnome/po/fa.po
+++ b/gnome/po/fa.po
@@ -1,4 +1,4 @@
-# persian translation of SFLphone
+# persian translation of Ring
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -524,7 +524,7 @@ msgid "None"
 msgstr "هیچکدام"
 
 #: ../src/config/assistant.c:241
-msgid "Welcome to the account registration wizard for SFLphone!"
+msgid "Welcome to the account registration wizard for Ring!"
 msgstr ""
 
 #: ../src/config/assistant.c:242
@@ -591,7 +591,7 @@ msgid "Congratulations!"
 msgstr "آفرین!"
 
 #: ../src/config/assistant.c:561
-msgid "SFLphone account registration wizard"
+msgid "Ring account registration wizard"
 msgstr ""
 
 #: ../src/config/audioconf.c:504
@@ -734,8 +734,8 @@ msgid "Window Behaviour"
 msgstr "وضع پنجره"
 
 #: ../src/config/preferencesdialog.c:195
-msgid "Bring SFLphone to foreground on incoming calls"
-msgstr "SFLphone را برای تماسهای ورودی به جلوی صفحه آورید"
+msgid "Bring Ring to foreground on incoming calls"
+msgstr "Ring را برای تماسهای ورودی به جلوی صفحه آورید"
 
 #. System Tray option frame
 #: ../src/config/preferencesdialog.c:202
@@ -743,8 +743,8 @@ msgid "System Tray Icon (Legacy)"
 msgstr "آیکن های سیستم (قدیمی)"
 
 #: ../src/config/preferencesdialog.c:209
-msgid "Show SFLphone in the system tray"
-msgstr "SFLphone  را در لیست سیستم ها نشان دهید"
+msgid "Show Ring in the system tray"
+msgstr "Ring  را در لیست سیستم ها نشان دهید"
 
 #: ../src/config/preferencesdialog.c:215
 msgid "_Popup main window on incoming call"
@@ -1111,10 +1111,10 @@ msgid "Status:"
 msgstr "وضعیت:"
 
 #: ../src/presencewindow.c:1168
-msgid "SFLphone Presence"
+msgid "Ring Presence"
 msgstr ""
 
-#: ../src/sflphone_client.c:60
+#: ../src/ring_client.c:60
 #, c-format
 msgid ""
 "%s\n"
@@ -1123,7 +1123,7 @@ msgstr ""
 "%s\n"
 "برای نمایش تمام گزینه‌های موجود خط فرمان «%s --help» را اجرا کنید.\n"
 
-#: ../src/sflphone_client.c:79
+#: ../src/ring_client.c:79
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -1131,17 +1131,17 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: ../src/sflphone_client.c:82
-msgid "SFLphone Error"
-msgstr "خطا در SFLPhone"
+#: ../src/ring_client.c:82
+msgid "Ring Error"
+msgstr "خطا در Ring"
 
-#: ../src/sflphone_options.c:60
+#: ../src/ring_options.c:60
 msgid "Enable debug"
 msgstr "به کار انداختن اشکال‌زدا"
 
-#: ../src/sflphone_options.c:67
-msgid "- GNOME client for SFLPhone"
-msgstr "نرم افزار GNOME  برای SFLPhone"
+#: ../src/ring_options.c:67
+msgid "- GNOME client for Ring"
+msgstr "نرم افزار GNOME  برای Ring"
 
 #: ../src/sflnotify.c:94
 #, c-format
@@ -1238,8 +1238,8 @@ msgid "_Hang up"
 msgstr "ـپایان تماس"
 
 #: ../src/statusicon.c:190
-msgid "SFLphone"
-msgstr "SFLphone"
+msgid "Ring"
+msgstr "Ring"
 
 #: ../src/uimanager.c:457
 msgid "No address book selected"
@@ -1255,12 +1255,12 @@ msgid "Voicemail(%i)"
 msgstr "پیغام گیر %i"
 
 #: ../src/uimanager.c:602
-msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
-msgstr "SFLphone یک سیستم VoIP است سازگار با پروتکل های  SIP و  IAX2"
+msgid "Ring is a VoIP client compatible with SIP and IAX2 protocols."
+msgstr "Ring یک سیستم VoIP است سازگار با پروتکل های  SIP و  IAX2"
 
 #: ../src/uimanager.c:605
-msgid "About SFLphone"
-msgstr "درباره SFLphone"
+msgid "About Ring"
+msgstr "درباره Ring"
 
 #: ../src/uimanager.c:718
 msgid "_Cancel"
diff --git a/gnome/po/fr.po b/gnome/po/fr.po
index 7c4856378c..589084ad79 100644
--- a/gnome/po/fr.po
+++ b/gnome/po/fr.po
@@ -1,4 +1,4 @@
-# French translation of SFLphone.
+# French translation of Ring.
 # Copyright (C) 2008 2009 The Free Software Foundation, Inc.
 # This file is distributed under the GNU General Public License Version 3.
 #
@@ -7,7 +7,7 @@
 # POT-Creation-Date: 2008-01-13 01:39+0100\n
 msgid ""
 msgstr ""
-"Project-Id-Version: SFLphone 0.9.8\n"
+"Project-Id-Version: Ring 0.9.8\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-07-14 21:27-0400\n"
 "PO-Revision-Date: 2014-07-02 20:01+0000\n"
@@ -526,8 +526,8 @@ msgid "None"
 msgstr "Aucun"
 
 #: ../src/config/assistant.c:241
-msgid "Welcome to the account registration wizard for SFLphone!"
-msgstr "Bienvenue dans l'assistant de configuration de compte de SFLphone!"
+msgid "Welcome to the account registration wizard for Ring!"
+msgstr "Bienvenue dans l'assistant de configuration de compte de Ring!"
 
 #: ../src/config/assistant.c:242
 msgid "This wizard will help you configure an existing account."
@@ -596,8 +596,8 @@ msgid "Congratulations!"
 msgstr "Félicitations!"
 
 #: ../src/config/assistant.c:561
-msgid "SFLphone account registration wizard"
-msgstr "Assistant de configuration de compte de SFLphone!"
+msgid "Ring account registration wizard"
+msgstr "Assistant de configuration de compte de Ring!"
 
 #: ../src/config/audioconf.c:504
 msgid "Frequency"
@@ -739,8 +739,8 @@ msgid "Window Behaviour"
 msgstr "Comportement de la fenêtre"
 
 #: ../src/config/preferencesdialog.c:195
-msgid "Bring SFLphone to foreground on incoming calls"
-msgstr "Amener SFLphone au premier plan sur un appel entrant"
+msgid "Bring Ring to foreground on incoming calls"
+msgstr "Amener Ring au premier plan sur un appel entrant"
 
 #. System Tray option frame
 #: ../src/config/preferencesdialog.c:202
@@ -748,8 +748,8 @@ msgid "System Tray Icon (Legacy)"
 msgstr "Icône dans la barre des tâches"
 
 #: ../src/config/preferencesdialog.c:209
-msgid "Show SFLphone in the system tray"
-msgstr "Montrer SFLphone dans la barre des tâches"
+msgid "Show Ring in the system tray"
+msgstr "Montrer Ring dans la barre des tâches"
 
 #: ../src/config/preferencesdialog.c:215
 msgid "_Popup main window on incoming call"
@@ -1122,10 +1122,10 @@ msgid "Status:"
 msgstr "État :"
 
 #: ../src/presencewindow.c:1168
-msgid "SFLphone Presence"
-msgstr "Présence SFLPhone"
+msgid "Ring Presence"
+msgstr "Présence Ring"
 
-#: ../src/sflphone_client.c:60
+#: ../src/ring_client.c:60
 #, c-format
 msgid ""
 "%s\n"
@@ -1135,7 +1135,7 @@ msgstr ""
 "Exécutez « %s --help » pour voir une liste complète des options "
 "disponibles.\n"
 
-#: ../src/sflphone_client.c:79
+#: ../src/ring_client.c:79
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -1146,17 +1146,17 @@ msgstr ""
 "Assurez-vous que le démon est en cours d'exécution.\n"
 "Erreur: %s"
 
-#: ../src/sflphone_client.c:82
-msgid "SFLphone Error"
-msgstr "Erreur SFLphone"
+#: ../src/ring_client.c:82
+msgid "Ring Error"
+msgstr "Erreur Ring"
 
-#: ../src/sflphone_options.c:60
+#: ../src/ring_options.c:60
 msgid "Enable debug"
 msgstr "Activer le débogage"
 
-#: ../src/sflphone_options.c:67
-msgid "- GNOME client for SFLPhone"
-msgstr "- Client Gnome pour SFLphone"
+#: ../src/ring_options.c:67
+msgid "- GNOME client for Ring"
+msgstr "- Client Gnome pour Ring"
 
 #: ../src/sflnotify.c:94
 #, c-format
@@ -1253,8 +1253,8 @@ msgid "_Hang up"
 msgstr "_Raccrocher"
 
 #: ../src/statusicon.c:190
-msgid "SFLphone"
-msgstr "SFLphone"
+msgid "Ring"
+msgstr "Ring"
 
 #: ../src/uimanager.c:457
 msgid "No address book selected"
@@ -1270,13 +1270,13 @@ msgid "Voicemail(%i)"
 msgstr "Boite vocale(%i)"
 
 #: ../src/uimanager.c:602
-msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
+msgid "Ring is a VoIP client compatible with SIP and IAX2 protocols."
 msgstr ""
-"SFLphone est un client VoIP compatible avec les protocoles SIP et IAX2."
+"Ring est un client VoIP compatible avec les protocoles SIP et IAX2."
 
 #: ../src/uimanager.c:605
-msgid "About SFLphone"
-msgstr "A propos de SFLphone"
+msgid "About Ring"
+msgstr "A propos de Ring"
 
 #: ../src/uimanager.c:718
 msgid "_Cancel"
diff --git a/gnome/po/hu.po b/gnome/po/hu.po
index 215988825e..52e710d251 100644
--- a/gnome/po/hu.po
+++ b/gnome/po/hu.po
@@ -520,7 +520,7 @@ msgid "None"
 msgstr "Egyik sem"
 
 #: ../src/config/assistant.c:241
-msgid "Welcome to the account registration wizard for SFLphone!"
+msgid "Welcome to the account registration wizard for Ring!"
 msgstr ""
 
 #: ../src/config/assistant.c:242
@@ -587,7 +587,7 @@ msgid "Congratulations!"
 msgstr "Gratulálunk!"
 
 #: ../src/config/assistant.c:561
-msgid "SFLphone account registration wizard"
+msgid "Ring account registration wizard"
 msgstr ""
 
 #: ../src/config/audioconf.c:504
@@ -730,8 +730,8 @@ msgid "Window Behaviour"
 msgstr "Ablak tulajdonságok"
 
 #: ../src/config/preferencesdialog.c:195
-msgid "Bring SFLphone to foreground on incoming calls"
-msgstr "Az SFLphone ablak megjelenítése bejövő hívás esetén"
+msgid "Bring Ring to foreground on incoming calls"
+msgstr "Az Ring ablak megjelenítése bejövő hívás esetén"
 
 #. System Tray option frame
 #: ../src/config/preferencesdialog.c:202
@@ -739,8 +739,8 @@ msgid "System Tray Icon (Legacy)"
 msgstr "Rendszer tálca ikon (Régebbi rendszereknél)"
 
 #: ../src/config/preferencesdialog.c:209
-msgid "Show SFLphone in the system tray"
-msgstr "SFLphone megjelenítése Rendszertálcán"
+msgid "Show Ring in the system tray"
+msgstr "Ring megjelenítése Rendszertálcán"
 
 #: ../src/config/preferencesdialog.c:215
 msgid "_Popup main window on incoming call"
@@ -1102,10 +1102,10 @@ msgid "Status:"
 msgstr "Állapot:"
 
 #: ../src/presencewindow.c:1168
-msgid "SFLphone Presence"
+msgid "Ring Presence"
 msgstr ""
 
-#: ../src/sflphone_client.c:60
+#: ../src/ring_client.c:60
 #, c-format
 msgid ""
 "%s\n"
@@ -1115,7 +1115,7 @@ msgstr ""
 "Adja ki a(z) „%s --help” parancsot az elérhető parancssori kapcsolók teljes "
 "listájáért.\n"
 
-#: ../src/sflphone_client.c:79
+#: ../src/ring_client.c:79
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -1123,16 +1123,16 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: ../src/sflphone_client.c:82
-msgid "SFLphone Error"
-msgstr "SFLphone Hiba"
+#: ../src/ring_client.c:82
+msgid "Ring Error"
+msgstr "Ring Hiba"
 
-#: ../src/sflphone_options.c:60
+#: ../src/ring_options.c:60
 msgid "Enable debug"
 msgstr "Hibakeresés engedélyezése"
 
-#: ../src/sflphone_options.c:67
-msgid "- GNOME client for SFLPhone"
+#: ../src/ring_options.c:67
+msgid "- GNOME client for Ring"
 msgstr ""
 
 #: ../src/sflnotify.c:94
@@ -1230,8 +1230,8 @@ msgid "_Hang up"
 msgstr "_Vonal bontása"
 
 #: ../src/statusicon.c:190
-msgid "SFLphone"
-msgstr "SFLphone"
+msgid "Ring"
+msgstr "Ring"
 
 #: ../src/uimanager.c:457
 msgid "No address book selected"
@@ -1247,12 +1247,12 @@ msgid "Voicemail(%i)"
 msgstr "Hangposta(%i)"
 
 #: ../src/uimanager.c:602
-msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
-msgstr "Az SFLphone egy SIP és IAX2 kompatibilis VoIP kliens."
+msgid "Ring is a VoIP client compatible with SIP and IAX2 protocols."
+msgstr "Az Ring egy SIP és IAX2 kompatibilis VoIP kliens."
 
 #: ../src/uimanager.c:605
-msgid "About SFLphone"
-msgstr "Az SFLphone-ról"
+msgid "About Ring"
+msgstr "Az Ring-ról"
 
 #: ../src/uimanager.c:718
 msgid "_Cancel"
diff --git a/gnome/po/it.po b/gnome/po/it.po
index 82db7855d1..4596e74f89 100644
--- a/gnome/po/it.po
+++ b/gnome/po/it.po
@@ -524,7 +524,7 @@ msgid "None"
 msgstr "Nessuno"
 
 #: ../src/config/assistant.c:241
-msgid "Welcome to the account registration wizard for SFLphone!"
+msgid "Welcome to the account registration wizard for Ring!"
 msgstr ""
 
 #: ../src/config/assistant.c:242
@@ -591,7 +591,7 @@ msgid "Congratulations!"
 msgstr "Congratulazioni!"
 
 #: ../src/config/assistant.c:561
-msgid "SFLphone account registration wizard"
+msgid "Ring account registration wizard"
 msgstr ""
 
 #: ../src/config/audioconf.c:504
@@ -734,7 +734,7 @@ msgid "Window Behaviour"
 msgstr ""
 
 #: ../src/config/preferencesdialog.c:195
-msgid "Bring SFLphone to foreground on incoming calls"
+msgid "Bring Ring to foreground on incoming calls"
 msgstr ""
 
 #. System Tray option frame
@@ -743,8 +743,8 @@ msgid "System Tray Icon (Legacy)"
 msgstr ""
 
 #: ../src/config/preferencesdialog.c:209
-msgid "Show SFLphone in the system tray"
-msgstr "Mostra SFLphone nel tray"
+msgid "Show Ring in the system tray"
+msgstr "Mostra Ring nel tray"
 
 #: ../src/config/preferencesdialog.c:215
 msgid "_Popup main window on incoming call"
@@ -1112,17 +1112,17 @@ msgid "Status:"
 msgstr ""
 
 #: ../src/presencewindow.c:1168
-msgid "SFLphone Presence"
+msgid "Ring Presence"
 msgstr ""
 
-#: ../src/sflphone_client.c:60
+#: ../src/ring_client.c:60
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 
-#: ../src/sflphone_client.c:79
+#: ../src/ring_client.c:79
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -1130,16 +1130,16 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: ../src/sflphone_client.c:82
-msgid "SFLphone Error"
-msgstr "Errore SFLphone"
+#: ../src/ring_client.c:82
+msgid "Ring Error"
+msgstr "Errore Ring"
 
-#: ../src/sflphone_options.c:60
+#: ../src/ring_options.c:60
 msgid "Enable debug"
 msgstr ""
 
-#: ../src/sflphone_options.c:67
-msgid "- GNOME client for SFLPhone"
+#: ../src/ring_options.c:67
+msgid "- GNOME client for Ring"
 msgstr ""
 
 #: ../src/sflnotify.c:94
@@ -1237,8 +1237,8 @@ msgid "_Hang up"
 msgstr "_Chiudi"
 
 #: ../src/statusicon.c:190
-msgid "SFLphone"
-msgstr "SFLphone"
+msgid "Ring"
+msgstr "Ring"
 
 #: ../src/uimanager.c:457
 msgid "No address book selected"
@@ -1254,12 +1254,12 @@ msgid "Voicemail(%i)"
 msgstr ""
 
 #: ../src/uimanager.c:602
-msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
-msgstr "SFLphone è un client VoIP compatibile con i protocolli SIP e IAX2."
+msgid "Ring is a VoIP client compatible with SIP and IAX2 protocols."
+msgstr "Ring è un client VoIP compatibile con i protocolli SIP e IAX2."
 
 #: ../src/uimanager.c:605
-msgid "About SFLphone"
-msgstr "Informazioni su SFLphone"
+msgid "About Ring"
+msgstr "Informazioni su Ring"
 
 #: ../src/uimanager.c:718
 msgid "_Cancel"
@@ -1423,7 +1423,7 @@ msgstr "Apri il manuale"
 
 #: ../src/uimanager.c:1153
 msgid "About this application"
-msgstr "Informazioni su SFLphone"
+msgstr "Informazioni su Ring"
 
 #: ../src/uimanager.c:1157
 msgid "_Transfer"
diff --git a/gnome/po/ja.po b/gnome/po/ja.po
index 7feffcf87b..c138dec7d8 100644
--- a/gnome/po/ja.po
+++ b/gnome/po/ja.po
@@ -518,7 +518,7 @@ msgid "None"
 msgstr "None"
 
 #: ../src/config/assistant.c:241
-msgid "Welcome to the account registration wizard for SFLphone!"
+msgid "Welcome to the account registration wizard for Ring!"
 msgstr ""
 
 #: ../src/config/assistant.c:242
@@ -585,7 +585,7 @@ msgid "Congratulations!"
 msgstr "コングラチュレーション!"
 
 #: ../src/config/assistant.c:561
-msgid "SFLphone account registration wizard"
+msgid "Ring account registration wizard"
 msgstr ""
 
 #: ../src/config/audioconf.c:504
@@ -728,7 +728,7 @@ msgid "Window Behaviour"
 msgstr ""
 
 #: ../src/config/preferencesdialog.c:195
-msgid "Bring SFLphone to foreground on incoming calls"
+msgid "Bring Ring to foreground on incoming calls"
 msgstr ""
 
 #. System Tray option frame
@@ -737,8 +737,8 @@ msgid "System Tray Icon (Legacy)"
 msgstr ""
 
 #: ../src/config/preferencesdialog.c:209
-msgid "Show SFLphone in the system tray"
-msgstr "システムトレイに SFLphone を表示"
+msgid "Show Ring in the system tray"
+msgstr "システムトレイに Ring を表示"
 
 #: ../src/config/preferencesdialog.c:215
 msgid "_Popup main window on incoming call"
@@ -1096,17 +1096,17 @@ msgid "Status:"
 msgstr ""
 
 #: ../src/presencewindow.c:1168
-msgid "SFLphone Presence"
+msgid "Ring Presence"
 msgstr ""
 
-#: ../src/sflphone_client.c:60
+#: ../src/ring_client.c:60
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 
-#: ../src/sflphone_client.c:79
+#: ../src/ring_client.c:79
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -1114,16 +1114,16 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: ../src/sflphone_client.c:82
-msgid "SFLphone Error"
-msgstr "SFLphone エラー"
+#: ../src/ring_client.c:82
+msgid "Ring Error"
+msgstr "Ring エラー"
 
-#: ../src/sflphone_options.c:60
+#: ../src/ring_options.c:60
 msgid "Enable debug"
 msgstr ""
 
-#: ../src/sflphone_options.c:67
-msgid "- GNOME client for SFLPhone"
+#: ../src/ring_options.c:67
+msgid "- GNOME client for Ring"
 msgstr ""
 
 #: ../src/sflnotify.c:94
@@ -1221,8 +1221,8 @@ msgid "_Hang up"
 msgstr "通話を切る(_H)"
 
 #: ../src/statusicon.c:190
-msgid "SFLphone"
-msgstr "SFLphone"
+msgid "Ring"
+msgstr "Ring"
 
 #: ../src/uimanager.c:457
 msgid "No address book selected"
@@ -1238,12 +1238,12 @@ msgid "Voicemail(%i)"
 msgstr "ボイスメール(%i)"
 
 #: ../src/uimanager.c:602
-msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
-msgstr "SFLphone は SIP と IAX2 プロトコルに互換性があるVoIPクライアントです"
+msgid "Ring is a VoIP client compatible with SIP and IAX2 protocols."
+msgstr "Ring は SIP と IAX2 プロトコルに互換性があるVoIPクライアントです"
 
 #: ../src/uimanager.c:605
-msgid "About SFLphone"
-msgstr "SFLphone について"
+msgid "About Ring"
+msgstr "Ring について"
 
 #: ../src/uimanager.c:718
 msgid "_Cancel"
diff --git a/gnome/po/ko.po b/gnome/po/ko.po
index 30f7a3f139..e3f89883bb 100644
--- a/gnome/po/ko.po
+++ b/gnome/po/ko.po
@@ -520,7 +520,7 @@ msgid "None"
 msgstr "없음"
 
 #: ../src/config/assistant.c:241
-msgid "Welcome to the account registration wizard for SFLphone!"
+msgid "Welcome to the account registration wizard for Ring!"
 msgstr ""
 
 #: ../src/config/assistant.c:242
@@ -587,7 +587,7 @@ msgid "Congratulations!"
 msgstr "축하합니다!"
 
 #: ../src/config/assistant.c:561
-msgid "SFLphone account registration wizard"
+msgid "Ring account registration wizard"
 msgstr ""
 
 #: ../src/config/audioconf.c:504
@@ -730,7 +730,7 @@ msgid "Window Behaviour"
 msgstr ""
 
 #: ../src/config/preferencesdialog.c:195
-msgid "Bring SFLphone to foreground on incoming calls"
+msgid "Bring Ring to foreground on incoming calls"
 msgstr ""
 
 #. System Tray option frame
@@ -739,7 +739,7 @@ msgid "System Tray Icon (Legacy)"
 msgstr ""
 
 #: ../src/config/preferencesdialog.c:209
-msgid "Show SFLphone in the system tray"
+msgid "Show Ring in the system tray"
 msgstr "SFL폰을 시스탬 트레이에 보여줍니다"
 
 #: ../src/config/preferencesdialog.c:215
@@ -1104,17 +1104,17 @@ msgid "Status:"
 msgstr ""
 
 #: ../src/presencewindow.c:1168
-msgid "SFLphone Presence"
+msgid "Ring Presence"
 msgstr ""
 
-#: ../src/sflphone_client.c:60
+#: ../src/ring_client.c:60
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 
-#: ../src/sflphone_client.c:79
+#: ../src/ring_client.c:79
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -1122,16 +1122,16 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: ../src/sflphone_client.c:82
-msgid "SFLphone Error"
-msgstr "SFLphone 오류"
+#: ../src/ring_client.c:82
+msgid "Ring Error"
+msgstr "Ring 오류"
 
-#: ../src/sflphone_options.c:60
+#: ../src/ring_options.c:60
 msgid "Enable debug"
 msgstr ""
 
-#: ../src/sflphone_options.c:67
-msgid "- GNOME client for SFLPhone"
+#: ../src/ring_options.c:67
+msgid "- GNOME client for Ring"
 msgstr ""
 
 #: ../src/sflnotify.c:94
@@ -1229,7 +1229,7 @@ msgid "_Hang up"
 msgstr "통화 끊기(_H)"
 
 #: ../src/statusicon.c:190
-msgid "SFLphone"
+msgid "Ring"
 msgstr "SFL폰"
 
 #: ../src/uimanager.c:457
@@ -1246,11 +1246,11 @@ msgid "Voicemail(%i)"
 msgstr ""
 
 #: ../src/uimanager.c:602
-msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
+msgid "Ring is a VoIP client compatible with SIP and IAX2 protocols."
 msgstr "SFL폰은 VoIP클라이언트와 SIP, IAX2 프로토콜과 호환 가능합니다."
 
 #: ../src/uimanager.c:605
-msgid "About SFLphone"
+msgid "About Ring"
 msgstr "SFL폰 정보"
 
 #: ../src/uimanager.c:718
diff --git a/gnome/po/nl.po b/gnome/po/nl.po
index 327d730d16..426acb18b6 100644
--- a/gnome/po/nl.po
+++ b/gnome/po/nl.po
@@ -1,6 +1,6 @@
-# SFLphone Dutch translation
+# Ring Dutch translation
 # Copyright (C) 2011 Savoir-Faire Linux
-# This file is distributed under the same license as the SFLphone package.
+# This file is distributed under the same license as the Ring package.
 #
 # Jan Middelkoop <jan@recreatie-zorg.nl>, 2011.
 msgid ""
@@ -524,7 +524,7 @@ msgid "None"
 msgstr "Geen"
 
 #: ../src/config/assistant.c:241
-msgid "Welcome to the account registration wizard for SFLphone!"
+msgid "Welcome to the account registration wizard for Ring!"
 msgstr ""
 
 #: ../src/config/assistant.c:242
@@ -592,7 +592,7 @@ msgid "Congratulations!"
 msgstr "Gefeliciteerd!"
 
 #: ../src/config/assistant.c:561
-msgid "SFLphone account registration wizard"
+msgid "Ring account registration wizard"
 msgstr ""
 
 #: ../src/config/audioconf.c:504
@@ -735,8 +735,8 @@ msgid "Window Behaviour"
 msgstr "Venstergedrag"
 
 #: ../src/config/preferencesdialog.c:195
-msgid "Bring SFLphone to foreground on incoming calls"
-msgstr "Breng SFLphone naar de voorgrond bij inkomende oproepen"
+msgid "Bring Ring to foreground on incoming calls"
+msgstr "Breng Ring naar de voorgrond bij inkomende oproepen"
 
 #. System Tray option frame
 #: ../src/config/preferencesdialog.c:202
@@ -744,8 +744,8 @@ msgid "System Tray Icon (Legacy)"
 msgstr "Icoon in systeemvak (legacy)"
 
 #: ../src/config/preferencesdialog.c:209
-msgid "Show SFLphone in the system tray"
-msgstr "Geef SFLphone weer in het systeemvak"
+msgid "Show Ring in the system tray"
+msgstr "Geef Ring weer in het systeemvak"
 
 #: ../src/config/preferencesdialog.c:215
 msgid "_Popup main window on incoming call"
@@ -1114,10 +1114,10 @@ msgid "Status:"
 msgstr "Status:"
 
 #: ../src/presencewindow.c:1168
-msgid "SFLphone Presence"
+msgid "Ring Presence"
 msgstr ""
 
-#: ../src/sflphone_client.c:60
+#: ../src/ring_client.c:60
 #, c-format
 msgid ""
 "%s\n"
@@ -1126,7 +1126,7 @@ msgstr ""
 "%s\n"
 "Voer ‘%s --help’ uit voor een lijst van beschikbare opties.\n"
 
-#: ../src/sflphone_client.c:79
+#: ../src/ring_client.c:79
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -1134,17 +1134,17 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: ../src/sflphone_client.c:82
-msgid "SFLphone Error"
-msgstr "SFLphone fout"
+#: ../src/ring_client.c:82
+msgid "Ring Error"
+msgstr "Ring fout"
 
-#: ../src/sflphone_options.c:60
+#: ../src/ring_options.c:60
 msgid "Enable debug"
 msgstr "Debuggen inschakelen"
 
-#: ../src/sflphone_options.c:67
-msgid "- GNOME client for SFLPhone"
-msgstr "- GNOME client voor SFLphone"
+#: ../src/ring_options.c:67
+msgid "- GNOME client for Ring"
+msgstr "- GNOME client voor Ring"
 
 #: ../src/sflnotify.c:94
 #, c-format
@@ -1241,8 +1241,8 @@ msgid "_Hang up"
 msgstr "_Ophangen"
 
 #: ../src/statusicon.c:190
-msgid "SFLphone"
-msgstr "SFLphone"
+msgid "Ring"
+msgstr "Ring"
 
 #: ../src/uimanager.c:457
 msgid "No address book selected"
@@ -1258,13 +1258,13 @@ msgid "Voicemail(%i)"
 msgstr "Voicemail(%i)"
 
 #: ../src/uimanager.c:602
-msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
+msgid "Ring is a VoIP client compatible with SIP and IAX2 protocols."
 msgstr ""
-"SFLphone is een VoIP telefoon compatibel met SIP en IAX2 protocollen."
+"Ring is een VoIP telefoon compatibel met SIP en IAX2 protocollen."
 
 #: ../src/uimanager.c:605
-msgid "About SFLphone"
-msgstr "Over SFLphone"
+msgid "About Ring"
+msgstr "Over Ring"
 
 #: ../src/uimanager.c:718
 msgid "_Cancel"
diff --git a/gnome/po/oc.po b/gnome/po/oc.po
index fd013edd4e..035e6a9cdc 100644
--- a/gnome/po/oc.po
+++ b/gnome/po/oc.po
@@ -518,7 +518,7 @@ msgid "None"
 msgstr "Pas cap"
 
 #: ../src/config/assistant.c:241
-msgid "Welcome to the account registration wizard for SFLphone!"
+msgid "Welcome to the account registration wizard for Ring!"
 msgstr ""
 
 #: ../src/config/assistant.c:242
@@ -585,7 +585,7 @@ msgid "Congratulations!"
 msgstr "Òsca !"
 
 #: ../src/config/assistant.c:561
-msgid "SFLphone account registration wizard"
+msgid "Ring account registration wizard"
 msgstr ""
 
 #: ../src/config/audioconf.c:504
@@ -728,8 +728,8 @@ msgid "Window Behaviour"
 msgstr "Comportament de la fenèstra"
 
 #: ../src/config/preferencesdialog.c:195
-msgid "Bring SFLphone to foreground on incoming calls"
-msgstr "Menar SFLphone al primièr plan sus un apèl entrant"
+msgid "Bring Ring to foreground on incoming calls"
+msgstr "Menar Ring al primièr plan sus un apèl entrant"
 
 #. System Tray option frame
 #: ../src/config/preferencesdialog.c:202
@@ -737,8 +737,8 @@ msgid "System Tray Icon (Legacy)"
 msgstr "Icòna dins la barra dels prètzfaches ()"
 
 #: ../src/config/preferencesdialog.c:209
-msgid "Show SFLphone in the system tray"
-msgstr "Far veire SFLphone dins la barra dels prètzfaches"
+msgid "Show Ring in the system tray"
+msgstr "Far veire Ring dins la barra dels prètzfaches"
 
 #: ../src/config/preferencesdialog.c:215
 msgid "_Popup main window on incoming call"
@@ -1096,10 +1096,10 @@ msgid "Status:"
 msgstr "Estat :"
 
 #: ../src/presencewindow.c:1168
-msgid "SFLphone Presence"
+msgid "Ring Presence"
 msgstr ""
 
-#: ../src/sflphone_client.c:60
+#: ../src/ring_client.c:60
 #, c-format
 msgid ""
 "%s\n"
@@ -1109,7 +1109,7 @@ msgstr ""
 "Aviatz « %s --help » per veire la lista completa de las opcions en linha de "
 "comanda disponiblas.\n"
 
-#: ../src/sflphone_client.c:79
+#: ../src/ring_client.c:79
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -1117,17 +1117,17 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: ../src/sflphone_client.c:82
-msgid "SFLphone Error"
-msgstr "Error SFLphone"
+#: ../src/ring_client.c:82
+msgid "Ring Error"
+msgstr "Error Ring"
 
-#: ../src/sflphone_options.c:60
+#: ../src/ring_options.c:60
 msgid "Enable debug"
 msgstr "Activar lo desbugatge"
 
-#: ../src/sflphone_options.c:67
-msgid "- GNOME client for SFLPhone"
-msgstr "- Client Gnome per SFLphone"
+#: ../src/ring_options.c:67
+msgid "- GNOME client for Ring"
+msgstr "- Client Gnome per Ring"
 
 #: ../src/sflnotify.c:94
 #, c-format
@@ -1224,8 +1224,8 @@ msgid "_Hang up"
 msgstr ""
 
 #: ../src/statusicon.c:190
-msgid "SFLphone"
-msgstr "SFLphone"
+msgid "Ring"
+msgstr "Ring"
 
 #: ../src/uimanager.c:457
 msgid "No address book selected"
@@ -1241,12 +1241,12 @@ msgid "Voicemail(%i)"
 msgstr ""
 
 #: ../src/uimanager.c:602
-msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
+msgid "Ring is a VoIP client compatible with SIP and IAX2 protocols."
 msgstr ""
 
 #: ../src/uimanager.c:605
-msgid "About SFLphone"
-msgstr "A prepaus de SFLphone"
+msgid "About Ring"
+msgstr "A prepaus de Ring"
 
 #: ../src/uimanager.c:718
 msgid "_Cancel"
diff --git a/gnome/po/pl.po b/gnome/po/pl.po
index a9b503f490..66a626a8e4 100644
--- a/gnome/po/pl.po
+++ b/gnome/po/pl.po
@@ -518,7 +518,7 @@ msgid "None"
 msgstr "Brak"
 
 #: ../src/config/assistant.c:241
-msgid "Welcome to the account registration wizard for SFLphone!"
+msgid "Welcome to the account registration wizard for Ring!"
 msgstr ""
 
 #: ../src/config/assistant.c:242
@@ -585,7 +585,7 @@ msgid "Congratulations!"
 msgstr "Gratulacje!"
 
 #: ../src/config/assistant.c:561
-msgid "SFLphone account registration wizard"
+msgid "Ring account registration wizard"
 msgstr ""
 
 #: ../src/config/audioconf.c:504
@@ -728,8 +728,8 @@ msgid "Window Behaviour"
 msgstr "Właściwości okna"
 
 #: ../src/config/preferencesdialog.c:195
-msgid "Bring SFLphone to foreground on incoming calls"
-msgstr "Gdy ktoś dzwoni - pokaż okno SFLphone"
+msgid "Bring Ring to foreground on incoming calls"
+msgstr "Gdy ktoś dzwoni - pokaż okno Ring"
 
 #. System Tray option frame
 #: ../src/config/preferencesdialog.c:202
@@ -737,8 +737,8 @@ msgid "System Tray Icon (Legacy)"
 msgstr "Ikonka na pasku systemowym"
 
 #: ../src/config/preferencesdialog.c:209
-msgid "Show SFLphone in the system tray"
-msgstr "Pokazuj SFLphone na pasku systemowym"
+msgid "Show Ring in the system tray"
+msgstr "Pokazuj Ring na pasku systemowym"
 
 #: ../src/config/preferencesdialog.c:215
 msgid "_Popup main window on incoming call"
@@ -1104,17 +1104,17 @@ msgid "Status:"
 msgstr ""
 
 #: ../src/presencewindow.c:1168
-msgid "SFLphone Presence"
+msgid "Ring Presence"
 msgstr ""
 
-#: ../src/sflphone_client.c:60
+#: ../src/ring_client.c:60
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 
-#: ../src/sflphone_client.c:79
+#: ../src/ring_client.c:79
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -1122,16 +1122,16 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: ../src/sflphone_client.c:82
-msgid "SFLphone Error"
+#: ../src/ring_client.c:82
+msgid "Ring Error"
 msgstr "błąd programu SFLphon"
 
-#: ../src/sflphone_options.c:60
+#: ../src/ring_options.c:60
 msgid "Enable debug"
 msgstr ""
 
-#: ../src/sflphone_options.c:67
-msgid "- GNOME client for SFLPhone"
+#: ../src/ring_options.c:67
+msgid "- GNOME client for Ring"
 msgstr ""
 
 #: ../src/sflnotify.c:94
@@ -1229,8 +1229,8 @@ msgid "_Hang up"
 msgstr "_Rozłącz"
 
 #: ../src/statusicon.c:190
-msgid "SFLphone"
-msgstr "SFLphone - telefon VoIP"
+msgid "Ring"
+msgstr "Ring - telefon VoIP"
 
 #: ../src/uimanager.c:457
 msgid "No address book selected"
@@ -1246,11 +1246,11 @@ msgid "Voicemail(%i)"
 msgstr ""
 
 #: ../src/uimanager.c:602
-msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
+msgid "Ring is a VoIP client compatible with SIP and IAX2 protocols."
 msgstr ""
 
 #: ../src/uimanager.c:605
-msgid "About SFLphone"
+msgid "About Ring"
 msgstr ""
 
 #: ../src/uimanager.c:718
diff --git a/gnome/po/pt.po b/gnome/po/pt.po
index 5fb4ab0dba..4bbf11160d 100644
--- a/gnome/po/pt.po
+++ b/gnome/po/pt.po
@@ -525,8 +525,8 @@ msgid "None"
 msgstr "Nenhuma"
 
 #: ../src/config/assistant.c:241
-msgid "Welcome to the account registration wizard for SFLphone!"
-msgstr "Bem vindo ao assistente de registro de conta do SFLPhone!"
+msgid "Welcome to the account registration wizard for Ring!"
+msgstr "Bem vindo ao assistente de registro de conta do Ring!"
 
 #: ../src/config/assistant.c:242
 msgid "This wizard will help you configure an existing account."
@@ -593,8 +593,8 @@ msgid "Congratulations!"
 msgstr "Parabéns!"
 
 #: ../src/config/assistant.c:561
-msgid "SFLphone account registration wizard"
-msgstr "Assistente de registro de conta do SFLPhone"
+msgid "Ring account registration wizard"
+msgstr "Assistente de registro de conta do Ring"
 
 #: ../src/config/audioconf.c:504
 msgid "Frequency"
@@ -736,8 +736,8 @@ msgid "Window Behaviour"
 msgstr "Comportamento da Janela"
 
 #: ../src/config/preferencesdialog.c:195
-msgid "Bring SFLphone to foreground on incoming calls"
-msgstr "Trazer o SFLPhone para o primeiro plano ao receber chamadas"
+msgid "Bring Ring to foreground on incoming calls"
+msgstr "Trazer o Ring para o primeiro plano ao receber chamadas"
 
 #. System Tray option frame
 #: ../src/config/preferencesdialog.c:202
@@ -745,8 +745,8 @@ msgid "System Tray Icon (Legacy)"
 msgstr "Ícone na Bandeja do Sistema (Legado)"
 
 #: ../src/config/preferencesdialog.c:209
-msgid "Show SFLphone in the system tray"
-msgstr "Mostrar o SFLPhone na bandeja do sistema"
+msgid "Show Ring in the system tray"
+msgstr "Mostrar o Ring na bandeja do sistema"
 
 #: ../src/config/preferencesdialog.c:215
 msgid "_Popup main window on incoming call"
@@ -1112,17 +1112,17 @@ msgid "Status:"
 msgstr ""
 
 #: ../src/presencewindow.c:1168
-msgid "SFLphone Presence"
+msgid "Ring Presence"
 msgstr ""
 
-#: ../src/sflphone_client.c:60
+#: ../src/ring_client.c:60
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 
-#: ../src/sflphone_client.c:79
+#: ../src/ring_client.c:79
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -1130,16 +1130,16 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: ../src/sflphone_client.c:82
-msgid "SFLphone Error"
+#: ../src/ring_client.c:82
+msgid "Ring Error"
 msgstr ""
 
-#: ../src/sflphone_options.c:60
+#: ../src/ring_options.c:60
 msgid "Enable debug"
 msgstr ""
 
-#: ../src/sflphone_options.c:67
-msgid "- GNOME client for SFLPhone"
+#: ../src/ring_options.c:67
+msgid "- GNOME client for Ring"
 msgstr ""
 
 #: ../src/sflnotify.c:94
@@ -1237,8 +1237,8 @@ msgid "_Hang up"
 msgstr "_Desligar"
 
 #: ../src/statusicon.c:190
-msgid "SFLphone"
-msgstr "SFLphone"
+msgid "Ring"
+msgstr "Ring"
 
 #: ../src/uimanager.c:457
 msgid "No address book selected"
@@ -1254,11 +1254,11 @@ msgid "Voicemail(%i)"
 msgstr ""
 
 #: ../src/uimanager.c:602
-msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
+msgid "Ring is a VoIP client compatible with SIP and IAX2 protocols."
 msgstr ""
 
 #: ../src/uimanager.c:605
-msgid "About SFLphone"
+msgid "About Ring"
 msgstr ""
 
 #: ../src/uimanager.c:718
diff --git a/gnome/po/pt_BR.po b/gnome/po/pt_BR.po
index 7b8d1155dc..c3672c717d 100644
--- a/gnome/po/pt_BR.po
+++ b/gnome/po/pt_BR.po
@@ -524,8 +524,8 @@ msgid "None"
 msgstr "Nenhum"
 
 #: ../src/config/assistant.c:241
-msgid "Welcome to the account registration wizard for SFLphone!"
-msgstr "Bem vindo ao assistente de registro de contas do SFLphone!"
+msgid "Welcome to the account registration wizard for Ring!"
+msgstr "Bem vindo ao assistente de registro de contas do Ring!"
 
 #: ../src/config/assistant.c:242
 msgid "This wizard will help you configure an existing account."
@@ -593,8 +593,8 @@ msgid "Congratulations!"
 msgstr "Parabéns!"
 
 #: ../src/config/assistant.c:561
-msgid "SFLphone account registration wizard"
-msgstr "Assistente de registro de conta do SFLphone"
+msgid "Ring account registration wizard"
+msgstr "Assistente de registro de conta do Ring"
 
 #: ../src/config/audioconf.c:504
 msgid "Frequency"
@@ -736,8 +736,8 @@ msgid "Window Behaviour"
 msgstr "Comportamento da Janela"
 
 #: ../src/config/preferencesdialog.c:195
-msgid "Bring SFLphone to foreground on incoming calls"
-msgstr "Mostrar SFLphone em primeiro plano ao receber chamadas"
+msgid "Bring Ring to foreground on incoming calls"
+msgstr "Mostrar Ring em primeiro plano ao receber chamadas"
 
 #. System Tray option frame
 #: ../src/config/preferencesdialog.c:202
@@ -745,8 +745,8 @@ msgid "System Tray Icon (Legacy)"
 msgstr "Ícone da Área de Notificação do Sistema (Legado)"
 
 #: ../src/config/preferencesdialog.c:209
-msgid "Show SFLphone in the system tray"
-msgstr "Exibir SFLphone na área de notificação"
+msgid "Show Ring in the system tray"
+msgstr "Exibir Ring na área de notificação"
 
 #: ../src/config/preferencesdialog.c:215
 msgid "_Popup main window on incoming call"
@@ -1116,10 +1116,10 @@ msgid "Status:"
 msgstr "Status"
 
 #: ../src/presencewindow.c:1168
-msgid "SFLphone Presence"
+msgid "Ring Presence"
 msgstr ""
 
-#: ../src/sflphone_client.c:60
+#: ../src/ring_client.c:60
 #, c-format
 msgid ""
 "%s\n"
@@ -1129,7 +1129,7 @@ msgstr ""
 "Execute \"%s --help\" para ver uma lista completa das opções de linha de "
 "comando.\n"
 
-#: ../src/sflphone_client.c:79
+#: ../src/ring_client.c:79
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -1137,17 +1137,17 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: ../src/sflphone_client.c:82
-msgid "SFLphone Error"
-msgstr "Erro no SFLphone"
+#: ../src/ring_client.c:82
+msgid "Ring Error"
+msgstr "Erro no Ring"
 
-#: ../src/sflphone_options.c:60
+#: ../src/ring_options.c:60
 msgid "Enable debug"
 msgstr "Habilitar depuração"
 
-#: ../src/sflphone_options.c:67
-msgid "- GNOME client for SFLPhone"
-msgstr "Cliente GNOME para o SFLPhone"
+#: ../src/ring_options.c:67
+msgid "- GNOME client for Ring"
+msgstr "Cliente GNOME para o Ring"
 
 #: ../src/sflnotify.c:94
 #, c-format
@@ -1244,8 +1244,8 @@ msgid "_Hang up"
 msgstr "_Desligar"
 
 #: ../src/statusicon.c:190
-msgid "SFLphone"
-msgstr "SFLphone"
+msgid "Ring"
+msgstr "Ring"
 
 #: ../src/uimanager.c:457
 msgid "No address book selected"
@@ -1261,12 +1261,12 @@ msgid "Voicemail(%i)"
 msgstr "Correio de voz(%i)"
 
 #: ../src/uimanager.c:602
-msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
-msgstr "SFLphone é um cliente VoIP compatível com os protocolos SIP e IAX2."
+msgid "Ring is a VoIP client compatible with SIP and IAX2 protocols."
+msgstr "Ring é um cliente VoIP compatível com os protocolos SIP e IAX2."
 
 #: ../src/uimanager.c:605
-msgid "About SFLphone"
-msgstr "Sobre o SFLphone"
+msgid "About Ring"
+msgstr "Sobre o Ring"
 
 #: ../src/uimanager.c:718
 msgid "_Cancel"
diff --git a/gnome/po/ru.po b/gnome/po/ru.po
index ff1f3dd955..ead336f4fe 100644
--- a/gnome/po/ru.po
+++ b/gnome/po/ru.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: SFLphone 0.9.6\n"
+"Project-Id-Version: Ring 0.9.6\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-07-14 21:27-0400\n"
 "PO-Revision-Date: 2014-01-09 21:07+0000\n"
@@ -524,7 +524,7 @@ msgid "None"
 msgstr "Нет"
 
 #: ../src/config/assistant.c:241
-msgid "Welcome to the account registration wizard for SFLphone!"
+msgid "Welcome to the account registration wizard for Ring!"
 msgstr ""
 
 #: ../src/config/assistant.c:242
@@ -592,7 +592,7 @@ msgid "Congratulations!"
 msgstr "Поздравляем!"
 
 #: ../src/config/assistant.c:561
-msgid "SFLphone account registration wizard"
+msgid "Ring account registration wizard"
 msgstr ""
 
 #: ../src/config/audioconf.c:504
@@ -735,8 +735,8 @@ msgid "Window Behaviour"
 msgstr "Настройки окна"
 
 #: ../src/config/preferencesdialog.c:195
-msgid "Bring SFLphone to foreground on incoming calls"
-msgstr "Запустить SFLphone при входящих звонках"
+msgid "Bring Ring to foreground on incoming calls"
+msgstr "Запустить Ring при входящих звонках"
 
 #. System Tray option frame
 #: ../src/config/preferencesdialog.c:202
@@ -744,8 +744,8 @@ msgid "System Tray Icon (Legacy)"
 msgstr "Иконка в панели задач"
 
 #: ../src/config/preferencesdialog.c:209
-msgid "Show SFLphone in the system tray"
-msgstr "Показывать SFLphone в системном трее"
+msgid "Show Ring in the system tray"
+msgstr "Показывать Ring в системном трее"
 
 #: ../src/config/preferencesdialog.c:215
 msgid "_Popup main window on incoming call"
@@ -1112,10 +1112,10 @@ msgid "Status:"
 msgstr "Статус:"
 
 #: ../src/presencewindow.c:1168
-msgid "SFLphone Presence"
-msgstr "Наличие SFLphone"
+msgid "Ring Presence"
+msgstr "Наличие Ring"
 
-#: ../src/sflphone_client.c:60
+#: ../src/ring_client.c:60
 #, c-format
 msgid ""
 "%s\n"
@@ -1124,7 +1124,7 @@ msgstr ""
 "%s\n"
 "Запустите '%s --help', чтобы увидеть полный список доступных команд.\n"
 
-#: ../src/sflphone_client.c:79
+#: ../src/ring_client.c:79
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -1132,17 +1132,17 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: ../src/sflphone_client.c:82
-msgid "SFLphone Error"
-msgstr "Ошибка SFLphone."
+#: ../src/ring_client.c:82
+msgid "Ring Error"
+msgstr "Ошибка Ring."
 
-#: ../src/sflphone_options.c:60
+#: ../src/ring_options.c:60
 msgid "Enable debug"
 msgstr "Включить отладку"
 
-#: ../src/sflphone_options.c:67
-msgid "- GNOME client for SFLPhone"
-msgstr "Клиент GNOME для SFLPhone"
+#: ../src/ring_options.c:67
+msgid "- GNOME client for Ring"
+msgstr "Клиент GNOME для Ring"
 
 #: ../src/sflnotify.c:94
 #, c-format
@@ -1239,8 +1239,8 @@ msgid "_Hang up"
 msgstr "_Положить трубку"
 
 #: ../src/statusicon.c:190
-msgid "SFLphone"
-msgstr "SFLphone"
+msgid "Ring"
+msgstr "Ring"
 
 #: ../src/uimanager.c:457
 msgid "No address book selected"
@@ -1256,12 +1256,12 @@ msgid "Voicemail(%i)"
 msgstr "Голосовое сообщение(%i)"
 
 #: ../src/uimanager.c:602
-msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
-msgstr "SFLphone - SIP и IAX2-совместимый VoIP-клиент"
+msgid "Ring is a VoIP client compatible with SIP and IAX2 protocols."
+msgstr "Ring - SIP и IAX2-совместимый VoIP-клиент"
 
 #: ../src/uimanager.c:605
-msgid "About SFLphone"
-msgstr "О программе SFLphone"
+msgid "About Ring"
+msgstr "О программе Ring"
 
 #: ../src/uimanager.c:718
 msgid "_Cancel"
diff --git a/gnome/po/sr.po b/gnome/po/sr.po
index ee389fe20e..4f29b4cca9 100644
--- a/gnome/po/sr.po
+++ b/gnome/po/sr.po
@@ -489,7 +489,7 @@ msgstr "Име"
 
 #: ../src/config/assistant.c:111
 msgid "This assistant is now finished."
-msgstr "То је то. СФЛ-телефон је подешен."
+msgstr "То је то. Ring је подешен."
 
 #: ../src/config/assistant.c:114
 msgid ""
@@ -524,7 +524,7 @@ msgid "None"
 msgstr "Ништа"
 
 #: ../src/config/assistant.c:241
-msgid "Welcome to the account registration wizard for SFLphone!"
+msgid "Welcome to the account registration wizard for Ring!"
 msgstr ""
 
 #: ../src/config/assistant.c:242
@@ -591,7 +591,7 @@ msgid "Congratulations!"
 msgstr "Свака част!"
 
 #: ../src/config/assistant.c:561
-msgid "SFLphone account registration wizard"
+msgid "Ring account registration wizard"
 msgstr ""
 
 #: ../src/config/audioconf.c:504
@@ -734,7 +734,7 @@ msgid "Window Behaviour"
 msgstr ""
 
 #: ../src/config/preferencesdialog.c:195
-msgid "Bring SFLphone to foreground on incoming calls"
+msgid "Bring Ring to foreground on incoming calls"
 msgstr ""
 
 #. System Tray option frame
@@ -743,8 +743,8 @@ msgid "System Tray Icon (Legacy)"
 msgstr ""
 
 #: ../src/config/preferencesdialog.c:209
-msgid "Show SFLphone in the system tray"
-msgstr "Прикажи СФЛ-фон у системској касети"
+msgid "Show Ring in the system tray"
+msgstr "Прикажи Ring у системској касети"
 
 #: ../src/config/preferencesdialog.c:215
 msgid "_Popup main window on incoming call"
@@ -1106,17 +1106,17 @@ msgid "Status:"
 msgstr ""
 
 #: ../src/presencewindow.c:1168
-msgid "SFLphone Presence"
+msgid "Ring Presence"
 msgstr ""
 
-#: ../src/sflphone_client.c:60
+#: ../src/ring_client.c:60
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 
-#: ../src/sflphone_client.c:79
+#: ../src/ring_client.c:79
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -1124,16 +1124,16 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: ../src/sflphone_client.c:82
-msgid "SFLphone Error"
-msgstr "СФЛ-телефон грешка"
+#: ../src/ring_client.c:82
+msgid "Ring Error"
+msgstr "Ring грешка"
 
-#: ../src/sflphone_options.c:60
+#: ../src/ring_options.c:60
 msgid "Enable debug"
 msgstr ""
 
-#: ../src/sflphone_options.c:67
-msgid "- GNOME client for SFLPhone"
+#: ../src/ring_options.c:67
+msgid "- GNOME client for Ring"
 msgstr ""
 
 #: ../src/sflnotify.c:94
@@ -1231,8 +1231,8 @@ msgid "_Hang up"
 msgstr "_Спусти слушалицу"
 
 #: ../src/statusicon.c:190
-msgid "SFLphone"
-msgstr "СФЛ-фон"
+msgid "Ring"
+msgstr ""
 
 #: ../src/uimanager.c:457
 msgid "No address book selected"
@@ -1248,12 +1248,12 @@ msgid "Voicemail(%i)"
 msgstr "Говорна пошта(%i)"
 
 #: ../src/uimanager.c:602
-msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
-msgstr "СФЛ-фон је ВоИП клијент који подржава СИП и ИА-Икс2 протоколе."
+msgid "Ring is a VoIP client compatible with SIP and IAX2 protocols."
+msgstr "Ring је ВоИП клијент који подржава СИП и ИА-Икс2 протоколе."
 
 #: ../src/uimanager.c:605
-msgid "About SFLphone"
-msgstr "О СФЛ-фону"
+msgid "About Ring"
+msgstr "О Ring"
 
 #: ../src/uimanager.c:718
 msgid "_Cancel"
diff --git a/gnome/po/sv.po b/gnome/po/sv.po
index 5f95d46a1a..c2d7b2c7e6 100644
--- a/gnome/po/sv.po
+++ b/gnome/po/sv.po
@@ -524,7 +524,7 @@ msgid "None"
 msgstr "Ingen"
 
 #: ../src/config/assistant.c:241
-msgid "Welcome to the account registration wizard for SFLphone!"
+msgid "Welcome to the account registration wizard for Ring!"
 msgstr ""
 
 #: ../src/config/assistant.c:242
@@ -592,7 +592,7 @@ msgid "Congratulations!"
 msgstr "Gratulerar!"
 
 #: ../src/config/assistant.c:561
-msgid "SFLphone account registration wizard"
+msgid "Ring account registration wizard"
 msgstr ""
 
 #: ../src/config/audioconf.c:504
@@ -735,7 +735,7 @@ msgid "Window Behaviour"
 msgstr ""
 
 #: ../src/config/preferencesdialog.c:195
-msgid "Bring SFLphone to foreground on incoming calls"
+msgid "Bring Ring to foreground on incoming calls"
 msgstr ""
 
 #. System Tray option frame
@@ -744,8 +744,8 @@ msgid "System Tray Icon (Legacy)"
 msgstr ""
 
 #: ../src/config/preferencesdialog.c:209
-msgid "Show SFLphone in the system tray"
-msgstr "Visa SFLphone i aktivitetsfältet"
+msgid "Show Ring in the system tray"
+msgstr "Visa Ring i aktivitetsfältet"
 
 #: ../src/config/preferencesdialog.c:215
 msgid "_Popup main window on incoming call"
@@ -1105,17 +1105,17 @@ msgid "Status:"
 msgstr ""
 
 #: ../src/presencewindow.c:1168
-msgid "SFLphone Presence"
+msgid "Ring Presence"
 msgstr ""
 
-#: ../src/sflphone_client.c:60
+#: ../src/ring_client.c:60
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 
-#: ../src/sflphone_client.c:79
+#: ../src/ring_client.c:79
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -1123,16 +1123,16 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: ../src/sflphone_client.c:82
-msgid "SFLphone Error"
-msgstr "Fel i SFLphone"
+#: ../src/ring_client.c:82
+msgid "Ring Error"
+msgstr "Fel i Ring"
 
-#: ../src/sflphone_options.c:60
+#: ../src/ring_options.c:60
 msgid "Enable debug"
 msgstr ""
 
-#: ../src/sflphone_options.c:67
-msgid "- GNOME client for SFLPhone"
+#: ../src/ring_options.c:67
+msgid "- GNOME client for Ring"
 msgstr ""
 
 #: ../src/sflnotify.c:94
@@ -1230,8 +1230,8 @@ msgid "_Hang up"
 msgstr "_Lägg på"
 
 #: ../src/statusicon.c:190
-msgid "SFLphone"
-msgstr "SFLphone"
+msgid "Ring"
+msgstr "Ring"
 
 #: ../src/uimanager.c:457
 msgid "No address book selected"
@@ -1247,12 +1247,12 @@ msgid "Voicemail(%i)"
 msgstr ""
 
 #: ../src/uimanager.c:602
-msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
-msgstr "SFLphone är en VoIP-klient kompatibel med SIP och IAX2-protokollen."
+msgid "Ring is a VoIP client compatible with SIP and IAX2 protocols."
+msgstr "Ring är en VoIP-klient kompatibel med SIP och IAX2-protokollen."
 
 #: ../src/uimanager.c:605
-msgid "About SFLphone"
-msgstr "Om SFLphone"
+msgid "About Ring"
+msgstr "Om Ring"
 
 #: ../src/uimanager.c:718
 msgid "_Cancel"
diff --git a/gnome/po/te.po b/gnome/po/te.po
index 2f046ab7fc..30bb46a455 100644
--- a/gnome/po/te.po
+++ b/gnome/po/te.po
@@ -518,7 +518,7 @@ msgid "None"
 msgstr ""
 
 #: ../src/config/assistant.c:241
-msgid "Welcome to the account registration wizard for SFLphone!"
+msgid "Welcome to the account registration wizard for Ring!"
 msgstr ""
 
 #: ../src/config/assistant.c:242
@@ -585,7 +585,7 @@ msgid "Congratulations!"
 msgstr "అభినందనలు!"
 
 #: ../src/config/assistant.c:561
-msgid "SFLphone account registration wizard"
+msgid "Ring account registration wizard"
 msgstr ""
 
 #: ../src/config/audioconf.c:504
@@ -728,7 +728,7 @@ msgid "Window Behaviour"
 msgstr ""
 
 #: ../src/config/preferencesdialog.c:195
-msgid "Bring SFLphone to foreground on incoming calls"
+msgid "Bring Ring to foreground on incoming calls"
 msgstr ""
 
 #. System Tray option frame
@@ -737,7 +737,7 @@ msgid "System Tray Icon (Legacy)"
 msgstr ""
 
 #: ../src/config/preferencesdialog.c:209
-msgid "Show SFLphone in the system tray"
+msgid "Show Ring in the system tray"
 msgstr ""
 
 #: ../src/config/preferencesdialog.c:215
@@ -1096,17 +1096,17 @@ msgid "Status:"
 msgstr ""
 
 #: ../src/presencewindow.c:1168
-msgid "SFLphone Presence"
+msgid "Ring Presence"
 msgstr ""
 
-#: ../src/sflphone_client.c:60
+#: ../src/ring_client.c:60
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 
-#: ../src/sflphone_client.c:79
+#: ../src/ring_client.c:79
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -1114,16 +1114,16 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: ../src/sflphone_client.c:82
-msgid "SFLphone Error"
+#: ../src/ring_client.c:82
+msgid "Ring Error"
 msgstr ""
 
-#: ../src/sflphone_options.c:60
+#: ../src/ring_options.c:60
 msgid "Enable debug"
 msgstr ""
 
-#: ../src/sflphone_options.c:67
-msgid "- GNOME client for SFLPhone"
+#: ../src/ring_options.c:67
+msgid "- GNOME client for Ring"
 msgstr ""
 
 #: ../src/sflnotify.c:94
@@ -1221,7 +1221,7 @@ msgid "_Hang up"
 msgstr ""
 
 #: ../src/statusicon.c:190
-msgid "SFLphone"
+msgid "Ring"
 msgstr ""
 
 #: ../src/uimanager.c:457
@@ -1238,12 +1238,12 @@ msgid "Voicemail(%i)"
 msgstr ""
 
 #: ../src/uimanager.c:602
-msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
+msgid "Ring is a VoIP client compatible with SIP and IAX2 protocols."
 msgstr ""
 
 #: ../src/uimanager.c:605
-msgid "About SFLphone"
-msgstr "SFLphone గురించి"
+msgid "About Ring"
+msgstr "Ring గురించి"
 
 #: ../src/uimanager.c:718
 msgid "_Cancel"
diff --git a/gnome/po/tr.po b/gnome/po/tr.po
index c0c88fea77..4a5c1d5159 100644
--- a/gnome/po/tr.po
+++ b/gnome/po/tr.po
@@ -520,7 +520,7 @@ msgid "None"
 msgstr "Hiçbiri"
 
 #: ../src/config/assistant.c:241
-msgid "Welcome to the account registration wizard for SFLphone!"
+msgid "Welcome to the account registration wizard for Ring!"
 msgstr ""
 
 #: ../src/config/assistant.c:242
@@ -589,7 +589,7 @@ msgid "Congratulations!"
 msgstr "Tebrikler!"
 
 #: ../src/config/assistant.c:561
-msgid "SFLphone account registration wizard"
+msgid "Ring account registration wizard"
 msgstr ""
 
 #: ../src/config/audioconf.c:504
@@ -732,7 +732,7 @@ msgid "Window Behaviour"
 msgstr ""
 
 #: ../src/config/preferencesdialog.c:195
-msgid "Bring SFLphone to foreground on incoming calls"
+msgid "Bring Ring to foreground on incoming calls"
 msgstr ""
 
 #. System Tray option frame
@@ -741,8 +741,8 @@ msgid "System Tray Icon (Legacy)"
 msgstr ""
 
 #: ../src/config/preferencesdialog.c:209
-msgid "Show SFLphone in the system tray"
-msgstr "SFLphone'u sistem çubuğunda göster"
+msgid "Show Ring in the system tray"
+msgstr "Ring'u sistem çubuğunda göster"
 
 #: ../src/config/preferencesdialog.c:215
 msgid "_Popup main window on incoming call"
@@ -1104,17 +1104,17 @@ msgid "Status:"
 msgstr ""
 
 #: ../src/presencewindow.c:1168
-msgid "SFLphone Presence"
+msgid "Ring Presence"
 msgstr ""
 
-#: ../src/sflphone_client.c:60
+#: ../src/ring_client.c:60
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 
-#: ../src/sflphone_client.c:79
+#: ../src/ring_client.c:79
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -1122,16 +1122,16 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: ../src/sflphone_client.c:82
-msgid "SFLphone Error"
-msgstr "SFLphone Hatası"
+#: ../src/ring_client.c:82
+msgid "Ring Error"
+msgstr "Ring Hatası"
 
-#: ../src/sflphone_options.c:60
+#: ../src/ring_options.c:60
 msgid "Enable debug"
 msgstr ""
 
-#: ../src/sflphone_options.c:67
-msgid "- GNOME client for SFLPhone"
+#: ../src/ring_options.c:67
+msgid "- GNOME client for Ring"
 msgstr ""
 
 #: ../src/sflnotify.c:94
@@ -1229,8 +1229,8 @@ msgid "_Hang up"
 msgstr ""
 
 #: ../src/statusicon.c:190
-msgid "SFLphone"
-msgstr "SFLphone"
+msgid "Ring"
+msgstr "Ring"
 
 #: ../src/uimanager.c:457
 msgid "No address book selected"
@@ -1246,12 +1246,12 @@ msgid "Voicemail(%i)"
 msgstr "Sesli posta(%i)"
 
 #: ../src/uimanager.c:602
-msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
-msgstr "SFLphone SIP ve IAX2 protokolleri ile uyumlu bir VoIP istemcisidir."
+msgid "Ring is a VoIP client compatible with SIP and IAX2 protocols."
+msgstr "Ring SIP ve IAX2 protokolleri ile uyumlu bir VoIP istemcisidir."
 
 #: ../src/uimanager.c:605
-msgid "About SFLphone"
-msgstr "SFLphone Hakkında"
+msgid "About Ring"
+msgstr "Ring Hakkında"
 
 #: ../src/uimanager.c:718
 msgid "_Cancel"
diff --git a/gnome/po/translations-tests/merge.py b/gnome/po/translations-tests/merge.py
index 0f058aba0d..b8a08a0d57 100755
--- a/gnome/po/translations-tests/merge.py
+++ b/gnome/po/translations-tests/merge.py
@@ -8,7 +8,7 @@ import sys
 from subprocess import call
 
 # check if template is present
-if "sflphone.pot" not in os.listdir(".."):
+if "ring.pot" not in os.listdir(".."):
     print "Theres is no template file, add one and try again."
     sys.exit()
 
@@ -19,7 +19,7 @@ num_errors = len(os.listdir("../errors"))
 call([
     "pomerge",
     # template
-    "-t", "../sflphone.pot",
+    "-t", "../ring.pot",
     # input directory
     "../errors",
     # output directory
diff --git a/gnome/po/uz.po b/gnome/po/uz.po
index 313fd06a10..bd8910792a 100644
--- a/gnome/po/uz.po
+++ b/gnome/po/uz.po
@@ -518,7 +518,7 @@ msgid "None"
 msgstr ""
 
 #: ../src/config/assistant.c:241
-msgid "Welcome to the account registration wizard for SFLphone!"
+msgid "Welcome to the account registration wizard for Ring!"
 msgstr ""
 
 #: ../src/config/assistant.c:242
@@ -585,7 +585,7 @@ msgid "Congratulations!"
 msgstr ""
 
 #: ../src/config/assistant.c:561
-msgid "SFLphone account registration wizard"
+msgid "Ring account registration wizard"
 msgstr ""
 
 #: ../src/config/audioconf.c:504
@@ -728,7 +728,7 @@ msgid "Window Behaviour"
 msgstr ""
 
 #: ../src/config/preferencesdialog.c:195
-msgid "Bring SFLphone to foreground on incoming calls"
+msgid "Bring Ring to foreground on incoming calls"
 msgstr ""
 
 #. System Tray option frame
@@ -737,7 +737,7 @@ msgid "System Tray Icon (Legacy)"
 msgstr ""
 
 #: ../src/config/preferencesdialog.c:209
-msgid "Show SFLphone in the system tray"
+msgid "Show Ring in the system tray"
 msgstr ""
 
 #: ../src/config/preferencesdialog.c:215
@@ -1096,17 +1096,17 @@ msgid "Status:"
 msgstr ""
 
 #: ../src/presencewindow.c:1168
-msgid "SFLphone Presence"
+msgid "Ring Presence"
 msgstr ""
 
-#: ../src/sflphone_client.c:60
+#: ../src/ring_client.c:60
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 
-#: ../src/sflphone_client.c:79
+#: ../src/ring_client.c:79
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -1114,16 +1114,16 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: ../src/sflphone_client.c:82
-msgid "SFLphone Error"
+#: ../src/ring_client.c:82
+msgid "Ring Error"
 msgstr ""
 
-#: ../src/sflphone_options.c:60
+#: ../src/ring_options.c:60
 msgid "Enable debug"
 msgstr ""
 
-#: ../src/sflphone_options.c:67
-msgid "- GNOME client for SFLPhone"
+#: ../src/ring_options.c:67
+msgid "- GNOME client for Ring"
 msgstr ""
 
 #: ../src/sflnotify.c:94
@@ -1221,7 +1221,7 @@ msgid "_Hang up"
 msgstr ""
 
 #: ../src/statusicon.c:190
-msgid "SFLphone"
+msgid "Ring"
 msgstr ""
 
 #: ../src/uimanager.c:457
@@ -1238,11 +1238,11 @@ msgid "Voicemail(%i)"
 msgstr ""
 
 #: ../src/uimanager.c:602
-msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
+msgid "Ring is a VoIP client compatible with SIP and IAX2 protocols."
 msgstr ""
 
 #: ../src/uimanager.c:605
-msgid "About SFLphone"
+msgid "About Ring"
 msgstr ""
 
 #: ../src/uimanager.c:718
diff --git a/gnome/po/vi.po b/gnome/po/vi.po
index d537bdc5b6..177510b17f 100644
--- a/gnome/po/vi.po
+++ b/gnome/po/vi.po
@@ -523,7 +523,7 @@ msgid "None"
 msgstr "Không có"
 
 #: ../src/config/assistant.c:241
-msgid "Welcome to the account registration wizard for SFLphone!"
+msgid "Welcome to the account registration wizard for Ring!"
 msgstr ""
 
 #: ../src/config/assistant.c:242
@@ -590,7 +590,7 @@ msgid "Congratulations!"
 msgstr "Xin chúc mừng!"
 
 #: ../src/config/assistant.c:561
-msgid "SFLphone account registration wizard"
+msgid "Ring account registration wizard"
 msgstr ""
 
 #: ../src/config/audioconf.c:504
@@ -733,8 +733,8 @@ msgid "Window Behaviour"
 msgstr "Hành vi cửa sổ"
 
 #: ../src/config/preferencesdialog.c:195
-msgid "Bring SFLphone to foreground on incoming calls"
-msgstr "Đưa SFLphone lên trên nếu có cuộc gọi đến"
+msgid "Bring Ring to foreground on incoming calls"
+msgstr "Đưa Ring lên trên nếu có cuộc gọi đến"
 
 #. System Tray option frame
 #: ../src/config/preferencesdialog.c:202
@@ -742,8 +742,8 @@ msgid "System Tray Icon (Legacy)"
 msgstr "System Tray Icon (Legacy)"
 
 #: ../src/config/preferencesdialog.c:209
-msgid "Show SFLphone in the system tray"
-msgstr "Hiện SFLphone trong system tray"
+msgid "Show Ring in the system tray"
+msgstr "Hiện Ring trong system tray"
 
 #: ../src/config/preferencesdialog.c:215
 msgid "_Popup main window on incoming call"
@@ -1110,10 +1110,10 @@ msgid "Status:"
 msgstr "Trạng thái:"
 
 #: ../src/presencewindow.c:1168
-msgid "SFLphone Presence"
-msgstr "Hiện diện SFLphone"
+msgid "Ring Presence"
+msgstr "Hiện diện Ring"
 
-#: ../src/sflphone_client.c:60
+#: ../src/ring_client.c:60
 #, c-format
 msgid ""
 "%s\n"
@@ -1122,7 +1122,7 @@ msgstr ""
 "%s\n"
 "Chạy '%s --help' để xem danh sách tuỳ chọn dòng lệnh.\n"
 
-#: ../src/sflphone_client.c:79
+#: ../src/ring_client.c:79
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -1130,17 +1130,17 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: ../src/sflphone_client.c:82
-msgid "SFLphone Error"
-msgstr "Lỗi SFLphone"
+#: ../src/ring_client.c:82
+msgid "Ring Error"
+msgstr "Lỗi Ring"
 
-#: ../src/sflphone_options.c:60
+#: ../src/ring_options.c:60
 msgid "Enable debug"
 msgstr "Bật gỡ lỗi"
 
-#: ../src/sflphone_options.c:67
-msgid "- GNOME client for SFLPhone"
-msgstr "- Chương trình khách GNOME cho SFLphone"
+#: ../src/ring_options.c:67
+msgid "- GNOME client for Ring"
+msgstr "- Chương trình khách GNOME cho Ring"
 
 #: ../src/sflnotify.c:94
 #, c-format
@@ -1237,8 +1237,8 @@ msgid "_Hang up"
 msgstr "_Ngừng"
 
 #: ../src/statusicon.c:190
-msgid "SFLphone"
-msgstr "SFLphone"
+msgid "Ring"
+msgstr "Ring"
 
 #: ../src/uimanager.c:457
 msgid "No address book selected"
@@ -1254,14 +1254,14 @@ msgid "Voicemail(%i)"
 msgstr "Thư thoại(%i)"
 
 #: ../src/uimanager.c:602
-msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
+msgid "Ring is a VoIP client compatible with SIP and IAX2 protocols."
 msgstr ""
-"SFLphone là một chương trình khách VoIP tương thích với các giao thức SIP và "
+"Ring là một chương trình khách VoIP tương thích với các giao thức SIP và "
 "IAX2"
 
 #: ../src/uimanager.c:605
-msgid "About SFLphone"
-msgstr "Nói về SFLphone"
+msgid "About Ring"
+msgstr "Nói về Ring"
 
 #: ../src/uimanager.c:718
 msgid "_Cancel"
diff --git a/gnome/po/zh_CN.po b/gnome/po/zh_CN.po
index 62178d5952..0394c431eb 100644
--- a/gnome/po/zh_CN.po
+++ b/gnome/po/zh_CN.po
@@ -1,4 +1,4 @@
-# Chinese translation of SFLphone.
+# Chinese translation of Ring.
 # Copyright (C) 2008 The Free Software Foundation, Inc.
 # This file is distributed under the GNU General Public License Version 3.
 #
@@ -6,7 +6,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: SFLphone 0.9.2\n"
+"Project-Id-Version: Ring 0.9.2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-07-14 21:27-0400\n"
 "PO-Revision-Date: 2013-10-02 16:32+0000\n"
@@ -519,7 +519,7 @@ msgid "None"
 msgstr "无"
 
 #: ../src/config/assistant.c:241
-msgid "Welcome to the account registration wizard for SFLphone!"
+msgid "Welcome to the account registration wizard for Ring!"
 msgstr ""
 
 #: ../src/config/assistant.c:242
@@ -586,7 +586,7 @@ msgid "Congratulations!"
 msgstr "恭喜!"
 
 #: ../src/config/assistant.c:561
-msgid "SFLphone account registration wizard"
+msgid "Ring account registration wizard"
 msgstr ""
 
 #: ../src/config/audioconf.c:504
@@ -729,7 +729,7 @@ msgid "Window Behaviour"
 msgstr ""
 
 #: ../src/config/preferencesdialog.c:195
-msgid "Bring SFLphone to foreground on incoming calls"
+msgid "Bring Ring to foreground on incoming calls"
 msgstr ""
 
 #. System Tray option frame
@@ -738,8 +738,8 @@ msgid "System Tray Icon (Legacy)"
 msgstr ""
 
 #: ../src/config/preferencesdialog.c:209
-msgid "Show SFLphone in the system tray"
-msgstr "在系统托盘显示 SFLphone"
+msgid "Show Ring in the system tray"
+msgstr "在系统托盘显示 Ring"
 
 #: ../src/config/preferencesdialog.c:215
 msgid "_Popup main window on incoming call"
@@ -1097,17 +1097,17 @@ msgid "Status:"
 msgstr ""
 
 #: ../src/presencewindow.c:1168
-msgid "SFLphone Presence"
+msgid "Ring Presence"
 msgstr ""
 
-#: ../src/sflphone_client.c:60
+#: ../src/ring_client.c:60
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 
-#: ../src/sflphone_client.c:79
+#: ../src/ring_client.c:79
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -1115,16 +1115,16 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: ../src/sflphone_client.c:82
-msgid "SFLphone Error"
-msgstr "SFLphone出错"
+#: ../src/ring_client.c:82
+msgid "Ring Error"
+msgstr "Ring出错"
 
-#: ../src/sflphone_options.c:60
+#: ../src/ring_options.c:60
 msgid "Enable debug"
 msgstr ""
 
-#: ../src/sflphone_options.c:67
-msgid "- GNOME client for SFLPhone"
+#: ../src/ring_options.c:67
+msgid "- GNOME client for Ring"
 msgstr ""
 
 #: ../src/sflnotify.c:94
@@ -1222,8 +1222,8 @@ msgid "_Hang up"
 msgstr "挂断(_H)"
 
 #: ../src/statusicon.c:190
-msgid "SFLphone"
-msgstr "SFLphone"
+msgid "Ring"
+msgstr "Ring"
 
 #: ../src/uimanager.c:457
 msgid "No address book selected"
@@ -1239,12 +1239,12 @@ msgid "Voicemail(%i)"
 msgstr ""
 
 #: ../src/uimanager.c:602
-msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
-msgstr "SFLphone是一个VoIP客户端,它兼容SIP和IAX2协议."
+msgid "Ring is a VoIP client compatible with SIP and IAX2 protocols."
+msgstr "Ring是一个VoIP客户端,它兼容SIP和IAX2协议."
 
 #: ../src/uimanager.c:605
-msgid "About SFLphone"
-msgstr "关于SFLphone"
+msgid "About Ring"
+msgstr "关于Ring"
 
 #: ../src/uimanager.c:718
 msgid "_Cancel"
diff --git a/gnome/po/zh_HK.po b/gnome/po/zh_HK.po
index 31f3cdc0e0..274e3f54b6 100644
--- a/gnome/po/zh_HK.po
+++ b/gnome/po/zh_HK.po
@@ -1,4 +1,4 @@
-# Chinese translation of SFLphone.
+# Chinese translation of Ring.
 # Copyright (C) 2008 The Free Software Foundation, Inc.
 # This file is distributed under the GNU General Public License Version 3.
 #
@@ -6,7 +6,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: SFLphone 0.9.2\n"
+"Project-Id-Version: Ring 0.9.2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-07-14 21:27-0400\n"
 "PO-Revision-Date: 2013-10-02 16:32+0000\n"
@@ -521,7 +521,7 @@ msgid "None"
 msgstr "無"
 
 #: ../src/config/assistant.c:241
-msgid "Welcome to the account registration wizard for SFLphone!"
+msgid "Welcome to the account registration wizard for Ring!"
 msgstr ""
 
 #: ../src/config/assistant.c:242
@@ -588,7 +588,7 @@ msgid "Congratulations!"
 msgstr "恭喜!"
 
 #: ../src/config/assistant.c:561
-msgid "SFLphone account registration wizard"
+msgid "Ring account registration wizard"
 msgstr ""
 
 #: ../src/config/audioconf.c:504
@@ -731,7 +731,7 @@ msgid "Window Behaviour"
 msgstr ""
 
 #: ../src/config/preferencesdialog.c:195
-msgid "Bring SFLphone to foreground on incoming calls"
+msgid "Bring Ring to foreground on incoming calls"
 msgstr ""
 
 #. System Tray option frame
@@ -740,8 +740,8 @@ msgid "System Tray Icon (Legacy)"
 msgstr ""
 
 #: ../src/config/preferencesdialog.c:209
-msgid "Show SFLphone in the system tray"
-msgstr "在系統匣顯示 SFLphone"
+msgid "Show Ring in the system tray"
+msgstr "在系統匣顯示 Ring"
 
 #: ../src/config/preferencesdialog.c:215
 msgid "_Popup main window on incoming call"
@@ -1103,17 +1103,17 @@ msgid "Status:"
 msgstr ""
 
 #: ../src/presencewindow.c:1168
-msgid "SFLphone Presence"
+msgid "Ring Presence"
 msgstr ""
 
-#: ../src/sflphone_client.c:60
+#: ../src/ring_client.c:60
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 
-#: ../src/sflphone_client.c:79
+#: ../src/ring_client.c:79
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -1121,16 +1121,16 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: ../src/sflphone_client.c:82
-msgid "SFLphone Error"
-msgstr "SFLphone 出錯"
+#: ../src/ring_client.c:82
+msgid "Ring Error"
+msgstr "Ring 出錯"
 
-#: ../src/sflphone_options.c:60
+#: ../src/ring_options.c:60
 msgid "Enable debug"
 msgstr ""
 
-#: ../src/sflphone_options.c:67
-msgid "- GNOME client for SFLPhone"
+#: ../src/ring_options.c:67
+msgid "- GNOME client for Ring"
 msgstr ""
 
 #: ../src/sflnotify.c:94
@@ -1228,8 +1228,8 @@ msgid "_Hang up"
 msgstr "收線(_H)"
 
 #: ../src/statusicon.c:190
-msgid "SFLphone"
-msgstr "SFLphone"
+msgid "Ring"
+msgstr "Ring"
 
 #: ../src/uimanager.c:457
 msgid "No address book selected"
@@ -1245,12 +1245,12 @@ msgid "Voicemail(%i)"
 msgstr "留言信息(%i)"
 
 #: ../src/uimanager.c:602
-msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
-msgstr "SFLphone 是 VoIP 用戶端,兼容 SIP 和 IAX2 協定。"
+msgid "Ring is a VoIP client compatible with SIP and IAX2 protocols."
+msgstr "Ring 是 VoIP 用戶端,兼容 SIP 和 IAX2 協定。"
 
 #: ../src/uimanager.c:605
-msgid "About SFLphone"
-msgstr "關於 SFLphone"
+msgid "About Ring"
+msgstr "關於 Ring"
 
 #: ../src/uimanager.c:718
 msgid "_Cancel"
diff --git a/gnome/po/zh_TW.po b/gnome/po/zh_TW.po
index 936a46896c..870ead3969 100644
--- a/gnome/po/zh_TW.po
+++ b/gnome/po/zh_TW.po
@@ -1,4 +1,4 @@
-# Chinese translation of SFLphone.
+# Chinese translation of Ring.
 # Copyright (C) 2008 The Free Software Foundation, Inc.
 # This file is distributed under the GNU General Public License Version 3.
 #
@@ -6,7 +6,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: SFLphone 0.9.2\n"
+"Project-Id-Version: Ring 0.9.2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-07-14 21:27-0400\n"
 "PO-Revision-Date: 2013-10-02 16:32+0000\n"
@@ -519,7 +519,7 @@ msgid "None"
 msgstr "無"
 
 #: ../src/config/assistant.c:241
-msgid "Welcome to the account registration wizard for SFLphone!"
+msgid "Welcome to the account registration wizard for Ring!"
 msgstr ""
 
 #: ../src/config/assistant.c:242
@@ -586,7 +586,7 @@ msgid "Congratulations!"
 msgstr "恭喜!"
 
 #: ../src/config/assistant.c:561
-msgid "SFLphone account registration wizard"
+msgid "Ring account registration wizard"
 msgstr ""
 
 #: ../src/config/audioconf.c:504
@@ -729,7 +729,7 @@ msgid "Window Behaviour"
 msgstr ""
 
 #: ../src/config/preferencesdialog.c:195
-msgid "Bring SFLphone to foreground on incoming calls"
+msgid "Bring Ring to foreground on incoming calls"
 msgstr ""
 
 #. System Tray option frame
@@ -738,8 +738,8 @@ msgid "System Tray Icon (Legacy)"
 msgstr ""
 
 #: ../src/config/preferencesdialog.c:209
-msgid "Show SFLphone in the system tray"
-msgstr "在系統匣顯示 SFLphone"
+msgid "Show Ring in the system tray"
+msgstr "在系統匣顯示 Ring"
 
 #: ../src/config/preferencesdialog.c:215
 msgid "_Popup main window on incoming call"
@@ -1101,17 +1101,17 @@ msgid "Status:"
 msgstr ""
 
 #: ../src/presencewindow.c:1168
-msgid "SFLphone Presence"
+msgid "Ring Presence"
 msgstr ""
 
-#: ../src/sflphone_client.c:60
+#: ../src/ring_client.c:60
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 
-#: ../src/sflphone_client.c:79
+#: ../src/ring_client.c:79
 #, c-format
 msgid ""
 "Unable to initialize.\n"
@@ -1119,16 +1119,16 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: ../src/sflphone_client.c:82
-msgid "SFLphone Error"
-msgstr "SFLphone 出錯"
+#: ../src/ring_client.c:82
+msgid "Ring Error"
+msgstr "Ring 出錯"
 
-#: ../src/sflphone_options.c:60
+#: ../src/ring_options.c:60
 msgid "Enable debug"
 msgstr ""
 
-#: ../src/sflphone_options.c:67
-msgid "- GNOME client for SFLPhone"
+#: ../src/ring_options.c:67
+msgid "- GNOME client for Ring"
 msgstr ""
 
 #: ../src/sflnotify.c:94
@@ -1226,8 +1226,8 @@ msgid "_Hang up"
 msgstr "掛線(_H)"
 
 #: ../src/statusicon.c:190
-msgid "SFLphone"
-msgstr "SFLphone"
+msgid "Ring"
+msgstr "Ring"
 
 #: ../src/uimanager.c:457
 msgid "No address book selected"
@@ -1243,12 +1243,12 @@ msgid "Voicemail(%i)"
 msgstr "留言信息(%i)"
 
 #: ../src/uimanager.c:602
-msgid "SFLphone is a VoIP client compatible with SIP and IAX2 protocols."
-msgstr "SFLphone 是 VoIP 用戶端,兼容 SIP 和 IAX2 協定。"
+msgid "Ring is a VoIP client compatible with SIP and IAX2 protocols."
+msgstr "Ring 是 VoIP 用戶端,兼容 SIP 和 IAX2 協定。"
 
 #: ../src/uimanager.c:605
-msgid "About SFLphone"
-msgstr "關於 SFLphone"
+msgid "About Ring"
+msgstr "關於 Ring"
 
 #: ../src/uimanager.c:718
 msgid "_Cancel"
diff --git a/gnome/sflphone.desktop.in b/gnome/ring.desktop.in
similarity index 65%
rename from gnome/sflphone.desktop.in
rename to gnome/ring.desktop.in
index 9cbc406016..8fff775fe4 100644
--- a/gnome/sflphone.desktop.in
+++ b/gnome/ring.desktop.in
@@ -1,10 +1,10 @@
 [Desktop Entry]
-Name=SFLphone
+Name=Ring
 GenericName=VoIP Client
-X-GNOME-FullName=SFLphone VoIP Client
+X-GNOME-FullName=Ring VoIP Client
 Comment=Call and receive calls with SIP or IAX protocols
-Exec=sflphone-client-gnome
-Icon=sflphone
+Exec=ring-client-gnome
+Icon=ring
 StartupNotify=true
 Terminal=false
 Type=Application
diff --git a/gnome/src/Makefile.am b/gnome/src/Makefile.am
index 80b59c32e1..29f46b975c 100644
--- a/gnome/src/Makefile.am
+++ b/gnome/src/Makefile.am
@@ -2,9 +2,9 @@ include ../globals.mak
 
 SUBDIRS = config contacts dbus widget icons video messaging
 
-bin_PROGRAMS = sflphone-client-gnome
+bin_PROGRAMS = ring-client-gnome
 
-SFLPHONE_LIBS=./contacts/libcontacts.la ./config/libconfig.la \
+RING_LIBS=./contacts/libcontacts.la ./config/libconfig.la \
               ./dbus/libdbus.la ./widget/libwidget.la ./icons/libicons.la \
               ./messaging/libmessaging.la
 
@@ -12,12 +12,12 @@ DL_LIBS = -ldl
 RT_LIBS = -lrt
 
 if SFL_VIDEO
-SFLPHONE_LIBS+=./video/libvideo.la
+RING_LIBS+=./video/libvideo.la
 endif
 
-noinst_LTLIBRARIES = libsflphone_client.la
+noinst_LTLIBRARIES = libring_client.la
 
-libsflphone_client_la_SOURCES = \
+libring_client_la_SOURCES = \
   uimanager.c \
   sflnotify.c \
   mainwindow.c \
@@ -50,36 +50,36 @@ libsflphone_client_la_SOURCES = \
   account_schema.h \
   history_loader.c \
   history_loader.h \
-  sflphone_client.h \
-  sflphone_client.c \
-  sflphone_options.c \
-  sflphone_options.h
+  ring_client.h \
+  ring_client.c \
+  ring_options.c \
+  ring_options.h
 
-libsflphone_client_la_SOURCES+=presence.c presence.h presencewindow.c presencewindow.h
+libring_client_la_SOURCES+=presence.c presence.h presencewindow.c presencewindow.h
 
-libsflphone_client_la_LIBADD = @CLUTTER_LIBS@ @CLUTTERGTK_LIBS@ $(SFLPHONE_LIBS)
-libsflphone_client_la_LDFLAGS = @CLUTTER_LDFLAGS@ @DBUSGLIB_LIBS@ @LIBNOTIFY_LIBS@ \
+libring_client_la_LIBADD = @CLUTTER_LIBS@ @CLUTTERGTK_LIBS@ $(RING_LIBS)
+libring_client_la_LDFLAGS = @CLUTTER_LDFLAGS@ @DBUSGLIB_LIBS@ @LIBNOTIFY_LIBS@ \
                                 @X11_LIBS@ @GTK_LIBS@ @GLIB_LIBS@ \
                                 $(DL_LIBS) $(RT_LIBS) \
                                 @CLUTTERGTK_LDFLAGS@
 
-libsflphone_client_la_CFLAGS = @CLUTTER_CFLAGS@ @DBUSGLIB_CFLAGS@ @LIBNOTIFY_CFLAGS@ \
+libring_client_la_CFLAGS = @CLUTTER_CFLAGS@ @DBUSGLIB_CFLAGS@ @LIBNOTIFY_CFLAGS@ \
                                @GTK_CFLAGS@ \
                                @CLUTTERGTK_CFLAGS@
 
 
-sflphone_client_gnome_SOURCES = main.c
-sflphone_client_gnome_CFLAGS = @DBUSGLIB_CFLAGS@ @LIBNOTIFY_CFLAGS@ \
+ring_client_gnome_SOURCES = main.c
+ring_client_gnome_CFLAGS = @DBUSGLIB_CFLAGS@ @LIBNOTIFY_CFLAGS@ \
                                @GTK_CFLAGS@
 
-sflphone_client_gnome_LDADD = libsflphone_client.la
+ring_client_gnome_LDADD = libring_client.la
 
 # add symbolic link
 install-exec-local:
 	echo $(prefix); echo $(bindir); echo $(datadir); echo $(libdir)
-	cd $(DESTDIR)$(bindir); ln -sf sflphone-client-gnome sflphone
+	cd $(DESTDIR)$(bindir); ln -sf ring-client-gnome ring
 
 uninstall-local:
-	-test -h $(DESTDIR)$(bindir)/sflphone && rm $(DESTDIR)$(bindir)/sflphone
+	-test -h $(DESTDIR)$(bindir)/ring && rm $(DESTDIR)$(bindir)/ring
 
 -include $(top_srcdir)/git.mk
diff --git a/gnome/src/actions.h b/gnome/src/actions.h
index 9dd2fc5bdb..e7ef53d0fe 100644
--- a/gnome/src/actions.h
+++ b/gnome/src/actions.h
@@ -35,7 +35,7 @@
 #include <libintl.h>
 #include <locale.h>
 
-#include "sflphone_client.h"
+#include "ring_client.h"
 #include "accountlist.h"
 #include "codeclist.h"
 #include "sflphone_const.h"
diff --git a/gnome/src/config/accountlistconfigdialog.h b/gnome/src/config/accountlistconfigdialog.h
index 61d7c6711d..0fea75432c 100644
--- a/gnome/src/config/accountlistconfigdialog.h
+++ b/gnome/src/config/accountlistconfigdialog.h
@@ -33,7 +33,7 @@
 #define ACCOUNTLISTDIALOG_H_
 
 #include "accountlist.h"
-#include "sflphone_client.h"
+#include "ring_client.h"
 
 void show_account_list_config_dialog(SFLPhoneClient *client);
 void update_account_list_status_bar(account_t *account);
diff --git a/gnome/src/config/addressbook-config.c b/gnome/src/config/addressbook-config.c
index 06f17e2f80..4078b2eb77 100644
--- a/gnome/src/config/addressbook-config.c
+++ b/gnome/src/config/addressbook-config.c
@@ -34,7 +34,7 @@
 #include "dbus.h"
 #include "searchbar.h"
 #include "contacts/addrbookfactory.h"
-#include "sflphone_client.h"
+#include "ring_client.h"
 #include <glib/gi18n.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/gnome/src/config/addressbook-config.h b/gnome/src/config/addressbook-config.h
index 33108ff025..fef1366d7c 100644
--- a/gnome/src/config/addressbook-config.h
+++ b/gnome/src/config/addressbook-config.h
@@ -34,7 +34,7 @@
 #include <gtk/gtk.h>
 
 #include "addressbook.h"
-#include "sflphone_client.h"
+#include "ring_client.h"
 
 /**
  * Save the parameters through D-BUS
diff --git a/gnome/src/config/audioconf.h b/gnome/src/config/audioconf.h
index d1c4618dc9..b7a01442fb 100644
--- a/gnome/src/config/audioconf.h
+++ b/gnome/src/config/audioconf.h
@@ -32,7 +32,7 @@
 #define AUDIO_CONF_H_
 
 #include <gtk/gtk.h>
-#include "sflphone_client.h"
+#include "ring_client.h"
 
 GtkWidget* create_audio_configuration(SFLPhoneClient *client);
 
diff --git a/gnome/src/config/preferencesdialog.h b/gnome/src/config/preferencesdialog.h
index 5521b4766c..0da2c83916 100644
--- a/gnome/src/config/preferencesdialog.h
+++ b/gnome/src/config/preferencesdialog.h
@@ -32,7 +32,7 @@
 #define __CONFIGWINDOW_H__
 
 #include "calllist.h"
-#include "sflphone_client.h"
+#include "ring_client.h"
 
 /**
  * @file preferencesdialog.h
diff --git a/gnome/src/config/tlsadvanceddialog.h b/gnome/src/config/tlsadvanceddialog.h
index c4309d074e..6746c48cff 100644
--- a/gnome/src/config/tlsadvanceddialog.h
+++ b/gnome/src/config/tlsadvanceddialog.h
@@ -35,7 +35,7 @@
   */
 
 #include "accountlist.h"
-#include "sflphone_client.h"
+#include "ring_client.h"
 
 /**
  * Display the advanced options window for zrtp
diff --git a/gnome/src/config/zrtpadvanceddialog.h b/gnome/src/config/zrtpadvanceddialog.h
index f079372a7b..af61a084af 100644
--- a/gnome/src/config/zrtpadvanceddialog.h
+++ b/gnome/src/config/zrtpadvanceddialog.h
@@ -38,7 +38,7 @@
 /**
  * Display the advanced options window for zrtp
  */
-#include "sflphone_client.h"
+#include "ring_client.h"
 
 void show_advanced_zrtp_options(account_t *account, SFLPhoneClient *client);
 
diff --git a/gnome/src/contacts/calllist.h b/gnome/src/contacts/calllist.h
index 9f8e8ce9df..a8ec199bd3 100644
--- a/gnome/src/contacts/calllist.h
+++ b/gnome/src/contacts/calllist.h
@@ -34,7 +34,7 @@
 #include <gtk/gtk.h>
 #include "callable_obj.h"
 #include "conference_obj.h"
-#include "sflphone_client.h"
+#include "ring_client.h"
 
 static const gchar * const CURRENT_CALLS = "current_calls";
 static const gchar * const HISTORY = "history";
diff --git a/gnome/src/contacts/calltab.h b/gnome/src/contacts/calltab.h
index df851d5047..c56f1b25bc 100644
--- a/gnome/src/contacts/calltab.h
+++ b/gnome/src/contacts/calltab.h
@@ -33,7 +33,7 @@
 
 #include "calllist.h"
 #include "conferencelist.h"
-#include "sflphone_client.h"
+#include "ring_client.h"
 #include <gtk/gtk.h>
 
 calltab_t* active_calltree_tab;
diff --git a/gnome/src/contacts/calltree.c b/gnome/src/contacts/calltree.c
index 5d38fc7535..a377ad4722 100644
--- a/gnome/src/contacts/calltree.c
+++ b/gnome/src/contacts/calltree.c
@@ -53,7 +53,7 @@
 #include "uimanager.h"
 #include "actions.h"
 #include "searchbar.h"
-#include "sflphone_client.h"
+#include "ring_client.h"
 
 #include "presencewindow.h"
 #include "presence.h"
diff --git a/gnome/src/contacts/calltree.h b/gnome/src/contacts/calltree.h
index 2de521210d..1ff2765edf 100644
--- a/gnome/src/contacts/calltree.h
+++ b/gnome/src/contacts/calltree.h
@@ -32,7 +32,7 @@
 #define __CALLTREE_H__
 
 #include "calltab.h"
-#include "sflphone_client.h"
+#include "ring_client.h"
 
 /** @file calltree.h
   * @brief The GtkTreeView that list calls in the main window.
diff --git a/gnome/src/dbus/dbus.c b/gnome/src/dbus/dbus.c
index b195a063ae..2686322e4e 100644
--- a/gnome/src/dbus/dbus.c
+++ b/gnome/src/dbus/dbus.c
@@ -52,7 +52,7 @@
 #include "accountlistconfigdialog.h"
 #include "accountconfigdialog.h"
 #include "messaging/message_tab.h"
-#include "sflphone_client.h"
+#include "ring_client.h"
 #include "dbus.h"
 #include "actions.h"
 
diff --git a/gnome/src/dialpad.h b/gnome/src/dialpad.h
index 182daf6175..1b0519693b 100644
--- a/gnome/src/dialpad.h
+++ b/gnome/src/dialpad.h
@@ -32,7 +32,7 @@
 #define __DIALPAD_H__
 
 #include <gtk/gtk.h>
-#include "sflphone_client.h"
+#include "ring_client.h"
 
 /** @file dialpad.h
   * @brief The dialpad widgets.
diff --git a/gnome/src/main.c b/gnome/src/main.c
index 5a867cb741..6d5bfd3e28 100644
--- a/gnome/src/main.c
+++ b/gnome/src/main.c
@@ -39,7 +39,7 @@
 #include <gtk/gtk.h>
 #include <stdlib.h>
 
-#include "sflphone_client.h"
+#include "ring_client.h"
 #include "history.h"
 
 static volatile sig_atomic_t interrupted;
@@ -97,7 +97,7 @@ main(int argc, char *argv[])
     textdomain(PACKAGE_NAME);
 
     g_set_application_name("Ring");
-    SFLPhoneClient *client = sflphone_client_new();
+    SFLPhoneClient *client = ring_client_new();
     GError *err = NULL;
     if (!g_application_register(G_APPLICATION(client), NULL, &err)) {
         g_warning("Could not register application: %s", err->message);
diff --git a/gnome/src/messaging/message_tab.h b/gnome/src/messaging/message_tab.h
index 618f8dcb1d..acfdde3bcb 100644
--- a/gnome/src/messaging/message_tab.h
+++ b/gnome/src/messaging/message_tab.h
@@ -38,7 +38,7 @@
 #include <gtk/gtk.h>
 #include "callable_obj.h"
 #include "conference_obj.h"
-#include "sflphone_client.h"
+#include "ring_client.h"
 
 /** An IM conversation */
 typedef struct {
diff --git a/gnome/src/presence.h b/gnome/src/presence.h
index 4f804ea808..77fd3c8e9c 100644
--- a/gnome/src/presence.h
+++ b/gnome/src/presence.h
@@ -33,7 +33,7 @@
 
 #include <glib.h>
 
-#include "sflphone_client.h"
+#include "ring_client.h"
 #include "accountlist.h"
 #include "callable_obj.h"
 
diff --git a/gnome/src/presencewindow.h b/gnome/src/presencewindow.h
index 534be90a56..e9b8c97ecf 100644
--- a/gnome/src/presencewindow.h
+++ b/gnome/src/presencewindow.h
@@ -31,7 +31,7 @@
 #ifndef __PRESENCEWINDOW_H__
 #define __PRESENCEWINDOW_H__
 
-#include "sflphone_client.h"
+#include "ring_client.h"
 #include "presence.h"
 
 /** @file presencewindow.h
diff --git a/gnome/src/sflphone_client.c b/gnome/src/ring_client.c
similarity index 85%
rename from gnome/src/sflphone_client.c
rename to gnome/src/ring_client.c
index ea4a4a209f..70bbcb227d 100644
--- a/gnome/src/sflphone_client.c
+++ b/gnome/src/ring_client.c
@@ -34,8 +34,8 @@
 #endif
 
 #include <glib/gi18n.h>
-#include "sflphone_client.h"
-#include "sflphone_options.h"
+#include "ring_client.h"
+#include "ring_options.h"
 #include "actions.h"
 #include "statusicon.h"
 #include "shortcuts.h"
@@ -44,10 +44,10 @@
 #include "video/video_widget.h"
 #endif
 
-G_DEFINE_TYPE(SFLPhoneClient, sflphone_client, GTK_TYPE_APPLICATION);
+G_DEFINE_TYPE(SFLPhoneClient, ring_client, GTK_TYPE_APPLICATION);
 
 static int
-sflphone_client_command_line_handler(G_GNUC_UNUSED GApplication *application,
+ring_client_command_line_handler(G_GNUC_UNUSED GApplication *application,
                                      GApplicationCommandLine *cmdline,
                                      SFLPhoneClient *client)
 {
@@ -119,31 +119,31 @@ sflphone_client_command_line_handler(G_GNUC_UNUSED GApplication *application,
 }
 
 SFLPhoneClient *
-sflphone_client_new()
+ring_client_new()
 {
-    SFLPhoneClient *client = g_object_new(sflphone_client_get_type(),
+    SFLPhoneClient *client = g_object_new(ring_client_get_type(),
             "application-id", "org.sfl.SFLphone",
             "flags", G_APPLICATION_HANDLES_COMMAND_LINE, NULL);
     return client;
 }
 
 static void
-sflphone_client_init(SFLPhoneClient *self)
+ring_client_init(SFLPhoneClient *self)
 {
-    self->settings = g_settings_new(SFLPHONE_GSETTINGS_SCHEMA);
+    self->settings = g_settings_new(RING_GSETTINGS_SCHEMA);
 
 #ifdef SFL_VIDEO
     self->video = video_widget_new();
 #endif
 
     self->win = 0;
-    g_signal_connect(G_OBJECT(self), "command-line", G_CALLBACK(sflphone_client_command_line_handler), self);
+    g_signal_connect(G_OBJECT(self), "command-line", G_CALLBACK(ring_client_command_line_handler), self);
 }
 
 static void
-sflphone_client_dispose(GObject *object)
+ring_client_dispose(GObject *object)
 {
-    SFLPhoneClient *self = SFLPHONE_CLIENT(object);
+    SFLPhoneClient *self = RING_CLIENT(object);
     /*
      * Unref all members to which self owns a reference.
      */
@@ -157,22 +157,22 @@ sflphone_client_dispose(GObject *object)
       }
 
       /* Chain up to the parent class */
-      G_OBJECT_CLASS(sflphone_client_parent_class)->dispose(object);
+      G_OBJECT_CLASS(ring_client_parent_class)->dispose(object);
 }
 
 static void
-sflphone_client_finalize(GObject *object)
+ring_client_finalize(GObject *object)
 {
     /* Chain up to the parent class */
-    G_OBJECT_CLASS(sflphone_client_parent_class)->finalize(object);
+    G_OBJECT_CLASS(ring_client_parent_class)->finalize(object);
 }
 
 static void
-sflphone_client_class_init(SFLPhoneClientClass *klass)
+ring_client_class_init(SFLPhoneClientClass *klass)
 {
     GObjectClass *object_class = (GObjectClass *) klass;
 
-    object_class->dispose = sflphone_client_dispose;
-    object_class->finalize = sflphone_client_finalize;
+    object_class->dispose = ring_client_dispose;
+    object_class->finalize = ring_client_finalize;
     /* TODO: add properties, signals, and signal handlers */
 }
diff --git a/gnome/src/sflphone_client.h b/gnome/src/ring_client.h
similarity index 86%
rename from gnome/src/sflphone_client.h
rename to gnome/src/ring_client.h
index ee5b40df5e..6901afd0e1 100644
--- a/gnome/src/sflphone_client.h
+++ b/gnome/src/ring_client.h
@@ -28,8 +28,8 @@
  *  as that of the covered work.
  */
 
-#ifndef SFLPHONE_CLIENT_H_
-#define SFLPHONE_CLIENT_H_
+#ifndef RING_CLIENT_H_
+#define RING_CLIENT_H_
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -37,9 +37,9 @@
 
 #include <gtk/gtk.h>
 
-#define SFLPHONE_GSETTINGS_SCHEMA "org.sflphone.SFLphone"
-#define SFLPHONE_TYPE_CLIENT (sflphone_client_get_type())
-#define SFLPHONE_CLIENT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), SFLPHONE_TYPE_CLIENT, SFLPhoneClient))
+#define RING_GSETTINGS_SCHEMA "org.sflphone.SFLphone"
+#define RING_TYPE_CLIENT (ring_client_get_type())
+#define RING_CLIENT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), RING_TYPE_CLIENT, SFLPhoneClient))
 
 typedef struct
 {
@@ -62,6 +62,6 @@ typedef struct
 typedef GtkApplicationClass SFLPhoneClientClass;
 
 SFLPhoneClient *
-sflphone_client_new();
+ring_client_new();
 
 #endif
diff --git a/gnome/src/sflphone_menus.ui b/gnome/src/ring_menus.ui
similarity index 100%
rename from gnome/src/sflphone_menus.ui
rename to gnome/src/ring_menus.ui
diff --git a/gnome/src/sflphone_options.c b/gnome/src/ring_options.c
similarity index 98%
rename from gnome/src/sflphone_options.c
rename to gnome/src/ring_options.c
index 3f19bbfccc..1f4c677e7e 100644
--- a/gnome/src/sflphone_options.c
+++ b/gnome/src/ring_options.c
@@ -33,7 +33,7 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <stdlib.h>
-#include "sflphone_options.h"
+#include "ring_options.h"
 
 G_GNUC_NORETURN static gboolean
 option_version_cb(G_GNUC_UNUSED const gchar *option_name,
diff --git a/gnome/src/sflphone_options.h b/gnome/src/ring_options.h
similarity index 94%
rename from gnome/src/sflphone_options.h
rename to gnome/src/ring_options.h
index a6cbe0028c..fa46e52ddf 100644
--- a/gnome/src/sflphone_options.h
+++ b/gnome/src/ring_options.h
@@ -28,12 +28,12 @@
  *  as that of the covered work.
  */
 
-#ifndef SFLPHONE_OPTIONS_H_
-#define SFLPHONE_OPTIONS_H_
+#ifndef RING_OPTIONS_H_
+#define RING_OPTIONS_H_
 
 #include <glib.h>
 
 GOptionContext *
 sflphone_options_get_context();
 
-#endif /* SFLPHONE_OPTIONS_H_ */
+#endif /* RING_OPTIONS_H_ */
diff --git a/gnome/src/sflnotify.h b/gnome/src/sflnotify.h
index d1de4f592c..0fcbbed3eb 100644
--- a/gnome/src/sflnotify.h
+++ b/gnome/src/sflnotify.h
@@ -37,7 +37,7 @@
 
 #include "accountlist.h"
 #include "calllist.h"
-#include "sflphone_client.h"
+#include "ring_client.h"
 
 /**
  * Notify an incoming call
diff --git a/gnome/src/shortcuts.h b/gnome/src/shortcuts.h
index 35dd1fef75..544d75f813 100644
--- a/gnome/src/shortcuts.h
+++ b/gnome/src/shortcuts.h
@@ -32,7 +32,7 @@
 #define SHORTCUTS_H_
 
 #include <gdk/gdkx.h>
-#include "sflphone_client.h"
+#include "ring_client.h"
 
 typedef struct {
     gchar *action;
diff --git a/gnome/src/statusicon.h b/gnome/src/statusicon.h
index 01f6d90fae..3c1fa34b10 100644
--- a/gnome/src/statusicon.h
+++ b/gnome/src/statusicon.h
@@ -33,7 +33,7 @@
 #define __STATUSICON_H__
 
 #include <gtk/gtk.h>
-#include "sflphone_client.h"
+#include "ring_client.h"
 
 /**
  * @file statusicon.h
diff --git a/gnome/src/uimanager.c b/gnome/src/uimanager.c
index cd071ae608..a81a372cc0 100644
--- a/gnome/src/uimanager.c
+++ b/gnome/src/uimanager.c
@@ -1087,16 +1087,16 @@ GtkBuilder *uibuilder_new(void)
     GtkBuilder* uibuilder = gtk_builder_new();
     GError *error = NULL;
     /* try local dir first */
-    gchar *ui_path = g_build_filename(SFLPHONE_UIDIR_UNINSTALLED, "sflphone_menus.ui", NULL);
+    gchar *ui_path = g_build_filename(SFLPHONE_UIDIR_UNINSTALLED, "ring_menus.ui", NULL);
 
     if (!g_file_test(ui_path, G_FILE_TEST_EXISTS)) {
         /* try install dir */
         g_free(ui_path);
-        ui_path = g_build_filename(SFLPHONE_UIDIR, "sflphone_menus.ui", NULL);
+        ui_path = g_build_filename(SFLPHONE_UIDIR, "ring_menus.ui", NULL);
 
         /* if neither dir exists then we cannot load the UI */
         if (!g_file_test(ui_path, G_FILE_TEST_EXISTS)) {
-            g_warning("Could not find \"sflphone_menus.ui\"");
+            g_warning("Could not find \"ring_menus.ui\"");
             g_free(ui_path);
             ui_path = NULL;
             g_object_unref(uibuilder);
diff --git a/gnome/src/uimanager.h b/gnome/src/uimanager.h
index 50da664032..afac49fb45 100644
--- a/gnome/src/uimanager.h
+++ b/gnome/src/uimanager.h
@@ -31,7 +31,7 @@
 #ifndef UI_MANAGER_H
 #define UI_MANAGER_H
 
-#include "sflphone_client.h"
+#include "ring_client.h"
 
 GtkWidget *historyButton_;
 GtkWidget *contactButton_;
diff --git a/gnome/src/video/video_callbacks.h b/gnome/src/video/video_callbacks.h
index 4cca243b33..43172eccbf 100644
--- a/gnome/src/video/video_callbacks.h
+++ b/gnome/src/video/video_callbacks.h
@@ -32,7 +32,7 @@
 #define VIDEO_CALLBACKS_H_
 
 #include "dbus.h"
-#include "sflphone_client.h"
+#include "ring_client.h"
 
 void started_decoding_video_cb(DBusGProxy *proxy, gchar *id, gchar *shm_path,
                                gint width, gint height, gboolean is_mixer,
diff --git a/gnome/src/video/video_widget.c b/gnome/src/video/video_widget.c
index 955d14b548..6fa6f06e84 100644
--- a/gnome/src/video/video_widget.c
+++ b/gnome/src/video/video_widget.c
@@ -33,7 +33,7 @@
 #include "video_renderer.h"
 #include "actions.h"
 
-#include "sflphone_client.h"    /* gsettings schema path */
+#include "ring_client.h"    /* gsettings schema path */
 #include "video_window.h"       /* for the window its contained in */
 
 #include <clutter/clutter.h>
@@ -190,7 +190,7 @@ video_widget_init(VideoWidget *self)
 
     /* init widget */
     priv->video_handles = NULL;
-    priv->settings = g_settings_new(SFLPHONE_GSETTINGS_SCHEMA);
+    priv->settings = g_settings_new(RING_GSETTINGS_SCHEMA);
     priv->fullscreen = FALSE;
 
     /* init video window where the the video widget will be contained */
diff --git a/gnome/src/video/video_window.c b/gnome/src/video/video_window.c
index 9679854396..823803bf2a 100644
--- a/gnome/src/video/video_window.c
+++ b/gnome/src/video/video_window.c
@@ -30,7 +30,7 @@
 
 #include "video_window.h"
 
-#include "sflphone_client.h"    /* gsettings schema path */
+#include "ring_client.h"    /* gsettings schema path */
 
 struct _VideoWindowPrivate {
     GtkWidget        *video;
@@ -100,7 +100,7 @@ video_window_init(VideoWindow *self)
     /* init widget */
     priv->video = NULL;
     priv->toolbar = NULL;
-    priv->settings = g_settings_new(SFLPHONE_GSETTINGS_SCHEMA);
+    priv->settings = g_settings_new(RING_GSETTINGS_SCHEMA);
     // priv->fullscreen = FALSE;
 }
 
diff --git a/gnome/tests/Makefile.am b/gnome/tests/Makefile.am
index b278bdae72..668de1620b 100644
--- a/gnome/tests/Makefile.am
+++ b/gnome/tests/Makefile.am
@@ -4,7 +4,7 @@ TESTS = check_global check_contacts check_config
 TESTS_ENVIRONMENT = GSETTINGS_SCHEMA_DIR=../data
 check_PROGRAMS = check_global check_contacts check_config
 
-SFLPHONE_LIBS= $(top_builddir)/src/libsflphone_client.la \
+RING_LIBS= $(top_builddir)/src/libring_client.la \
                $(top_builddir)/src/contacts/libcontacts.la \
                $(top_builddir)/src/config/libconfig.la \
                $(top_builddir)/src/dbus/libdbus.la \
@@ -14,15 +14,15 @@ SFLPHONE_LIBS= $(top_builddir)/src/libsflphone_client.la \
 check_global_SOURCES = check_global.c
 
 check_global_CFLAGS = @CHECK_CFLAGS@ @GTK_CFLAGS@ @GLIB_CFLAGS@ @DBUSGLIB_CFLAGS@
-check_global_LDADD = $(SFLPHONE_LIBS) @CHECK_LIBS@ @GLIB_LIBS@ @GTK_LIBS@ @DBUSGLIB_LIBS@ -ldl @X11_LIBS@
+check_global_LDADD = $(RING_LIBS) @CHECK_LIBS@ @GLIB_LIBS@ @GTK_LIBS@ @DBUSGLIB_LIBS@ -ldl @X11_LIBS@
 
 check_contacts_SOURCES = check_contacts.c
 check_contacts_CFLAGS = @CHECK_CFLAGS@ @GTK_CFLAGS@
-check_contacts_LDADD = $(SFLPHONE_LIBS) @CHECK_LIBS@
+check_contacts_LDADD = $(RING_LIBS) @CHECK_LIBS@
 
 check_config_SOURCES = check_config.c
 check_config_CFLAGS = @CHECK_CFLAGS@ @GTK_CFLAGS@
-check_config_LDADD = $(SFLPHONE_LIBS) @CHECK_LIBS@
+check_config_LDADD = $(RING_LIBS) @CHECK_LIBS@
 
 clean-local:
 	rm -rf *.xml
-- 
GitLab