iOS: prepare for release
Change-Id: I2c27d645c5cab86298a7bd960ee8b0e230910682
diff --git a/Ring/Ring/Info.plist b/Ring/Ring/Info.plist
index 516b020..0668168 100644
--- a/Ring/Ring/Info.plist
+++ b/Ring/Ring/Info.plist
@@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>2.10</string>
+ <string>2.11</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
diff --git a/Ring/Ring/Resources/ar.lproj/Localizable.strings b/Ring/Ring/Resources/ar.lproj/Localizable.strings
index 25864b5..5a0d691 100644
--- a/Ring/Ring/Resources/ar.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ar.lproj/Localizable.strings
@@ -173,6 +173,7 @@
"account.sipPassword" = "كلمة السر";
"account.sipServer" = "SIP Server";
"account.port" = "نقطة عبور ( port )";
+"account.proxyServer" = "الوكيل";
"account.createSipAccount" = "Create Sip Account";
"account.usernameLabel" = "Enter Username";
"account.passwordLabel" = "Enter Password";
@@ -238,3 +239,7 @@
"generatedMessage.missedOutgoingCall" = "Missed outgoing call";
"generatedMessage.missedIncomingCall" = "Missed incoming call";
+//General Settings
+"generalSettings.title" = "General settings";
+"generalSettings.videoAcceleration" = "Enable video acceleration";
+
diff --git a/Ring/Ring/Resources/bg.lproj/Localizable.strings b/Ring/Ring/Resources/bg.lproj/Localizable.strings
index d188b4b..0c65938 100644
--- a/Ring/Ring/Resources/bg.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/bg.lproj/Localizable.strings
@@ -173,6 +173,7 @@
"account.sipPassword" = "Парола";
"account.sipServer" = "SIP Server";
"account.port" = "Порт";
+"account.proxyServer" = "Прокси";
"account.createSipAccount" = "Create Sip Account";
"account.usernameLabel" = "Enter Username";
"account.passwordLabel" = "Enter Password";
@@ -238,3 +239,7 @@
"generatedMessage.missedOutgoingCall" = "Пропуснато изходящо обаждане";
"generatedMessage.missedIncomingCall" = "Пропуснато входящо обаждане";
+//General Settings
+"generalSettings.title" = "General settings";
+"generalSettings.videoAcceleration" = "Enable video acceleration";
+
diff --git a/Ring/Ring/Resources/ca.lproj/Localizable.strings b/Ring/Ring/Resources/ca.lproj/Localizable.strings
index 2eda481..57e7e56 100644
--- a/Ring/Ring/Resources/ca.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ca.lproj/Localizable.strings
@@ -173,6 +173,7 @@
"account.sipPassword" = "Contrasenya";
"account.sipServer" = "SIP Server";
"account.port" = "Port";
+"account.proxyServer" = "Intermediari";
"account.createSipAccount" = "Create Sip Account";
"account.usernameLabel" = "Enter Username";
"account.passwordLabel" = "Enter Password";
@@ -238,3 +239,7 @@
"generatedMessage.missedOutgoingCall" = "Trucada sortint perduda";
"generatedMessage.missedIncomingCall" = "Trucada entrant perduda";
+//General Settings
+"generalSettings.title" = "General settings";
+"generalSettings.videoAcceleration" = "Enable video acceleration";
+
diff --git a/Ring/Ring/Resources/cs-CZ.lproj/Localizable.strings b/Ring/Ring/Resources/cs-CZ.lproj/Localizable.strings
index b272186..64d7121 100644
--- a/Ring/Ring/Resources/cs-CZ.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/cs-CZ.lproj/Localizable.strings
@@ -173,6 +173,7 @@
"account.sipPassword" = "Heslo";
"account.sipServer" = "Server SIP";
"account.port" = "Port";
+"account.proxyServer" = "Proxy";
"account.createSipAccount" = "Create Sip Account";
"account.usernameLabel" = "Enter Username";
"account.passwordLabel" = "Zadejte heslo";
@@ -238,3 +239,7 @@
"generatedMessage.missedOutgoingCall" = "Zmeškaný odchozí hovor";
"generatedMessage.missedIncomingCall" = "Zmeškaný příchozí hovor";
+//General Settings
+"generalSettings.title" = "Obecná nastavení";
+"generalSettings.videoAcceleration" = "Enable video acceleration";
+
diff --git a/Ring/Ring/Resources/da.lproj/Localizable.strings b/Ring/Ring/Resources/da.lproj/Localizable.strings
index 6aa9883..403382c 100644
--- a/Ring/Ring/Resources/da.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/da.lproj/Localizable.strings
@@ -173,6 +173,7 @@
"account.sipPassword" = "Adgangskode";
"account.sipServer" = "SIP Server";
"account.port" = "Port";
+"account.proxyServer" = "Stedfortræder";
"account.createSipAccount" = "Create Sip Account";
"account.usernameLabel" = "Enter Username";
"account.passwordLabel" = "Indtast kodeord";
@@ -238,3 +239,7 @@
"generatedMessage.missedOutgoingCall" = "Ubesvarede udgående opkald";
"generatedMessage.missedIncomingCall" = "Ubesvarede indgående opkald";
+//General Settings
+"generalSettings.title" = "Generelle indstillinger";
+"generalSettings.videoAcceleration" = "Enable video acceleration";
+
diff --git a/Ring/Ring/Resources/de-DE.lproj/Localizable.strings b/Ring/Ring/Resources/de-DE.lproj/Localizable.strings
index 96c6b4c..7f7e9eb 100644
--- a/Ring/Ring/Resources/de-DE.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/de-DE.lproj/Localizable.strings
@@ -173,6 +173,7 @@
"account.sipPassword" = "Kennwort";
"account.sipServer" = "SIP Server";
"account.port" = "Port";
+"account.proxyServer" = "Proxy";
"account.createSipAccount" = "Create Sip Account";
"account.usernameLabel" = "Enter Username";
"account.passwordLabel" = "Passwort eingeben";
@@ -238,3 +239,7 @@
"generatedMessage.missedOutgoingCall" = "Verpasster ausgehender Anruf";
"generatedMessage.missedIncomingCall" = "Verpasster eingehender Anruf";
+//General Settings
+"generalSettings.title" = "Allgemeine Einstellungen";
+"generalSettings.videoAcceleration" = "Enable video acceleration";
+
diff --git a/Ring/Ring/Resources/de.lproj/Localizable.strings b/Ring/Ring/Resources/de.lproj/Localizable.strings
index c890f60..5d401d5 100644
--- a/Ring/Ring/Resources/de.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/de.lproj/Localizable.strings
@@ -173,6 +173,7 @@
"account.sipPassword" = "Passwort";
"account.sipServer" = "SIP Server";
"account.port" = "Port";
+"account.proxyServer" = "Proxy";
"account.createSipAccount" = "Create Sip Account";
"account.usernameLabel" = "Enter Username";
"account.passwordLabel" = "Passwort eingeben";
@@ -238,3 +239,7 @@
"generatedMessage.missedOutgoingCall" = "Verpasster ausgehender Anruf";
"generatedMessage.missedIncomingCall" = "Verpasster eingehender Anruf";
+//General Settings
+"generalSettings.title" = "Allgemeine Einstellungen";
+"generalSettings.videoAcceleration" = "Enable video acceleration";
+
diff --git a/Ring/Ring/Resources/el.lproj/Localizable.strings b/Ring/Ring/Resources/el.lproj/Localizable.strings
index b9204b3..73c2e40 100644
--- a/Ring/Ring/Resources/el.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/el.lproj/Localizable.strings
@@ -38,7 +38,7 @@
"smartlist.searchBarPlaceholder" = "Enter name...";
"smartlist.noNetworkConnectivity" = "Καμία σύνδεση στο δίκτυο";
"smartlist.cellularAccess" = "Be sure cellular access is granted in your settings";
-"smartlist.accountsTitle" = "Accounts";
+"smartlist.accountsTitle" = "Λογαριασμοί";
"smartlist.addAccountButton" = "+ Add Account";
"smartlist.noNumber" = "Selected contact does not have any number";
"smartlist.selectOneNumber" = "Select one of the numbers";
@@ -121,7 +121,7 @@
"actions.deleteAction" = "Διαγραφή";
"actions.cancelAction" = "Ακύρωση";
"actions.clearAction" = "Clear";
-"actions.backAction" = "Back";
+"actions.backAction" = "Πίσω";
"alerts.incomingCallAllertTitle" = "Incoming call from ";
"alerts.incomingCallButtonAccept" = "Αποδοχή";
"alerts.incomingCallButtonIgnore" = "Ignore";
@@ -164,15 +164,16 @@
"accountPage.deviceRevocationError" = "Device revocation error";
"accountPage.namePlaceholder" = "Όνομα";
"accountPage.linkDeviceTitle" = "Link another device";
-"accountPage.other" = "Other";
+"accountPage.other" = "Άλλα";
"accountPage.removeAccountTitle" = "Remove account";
"accountPage.removeAccountMessage" = "By clicking \"Remove\" you will remove this account on this device! This action can not be undone. Also, your registered name can be lost.";
"accountPage.removeAccountButton" = "Remove";
//Account
"account.sipUsername" = "User Name";
-"account.sipPassword" = "Password";
+"account.sipPassword" = "Συνθηματικό";
"account.sipServer" = "SIP Server";
-"account.port" = "Port";
+"account.port" = "Θύρα";
+"account.proxyServer" = "Διαμεσολαβητής";
"account.createSipAccount" = "Create Sip Account";
"account.usernameLabel" = "Enter Username";
"account.passwordLabel" = "Enter Password";
@@ -182,8 +183,8 @@
"account.enableAccount" = "Enable Account";
"account.statusOnline" = "Online";
"account.statusOffline" = "Offline";
-"account.statusConnecting" = "Connecting";
-"account.statusUnknown" = "Unknown";
+"account.statusConnecting" = "Συνδέεται";
+"account.statusUnknown" = "Άγνωστοι";
"account.statusConnectionerror" = "Connection Error";
//Block List Page
@@ -238,3 +239,7 @@
"generatedMessage.missedOutgoingCall" = "Αναπάντητη εξερχόμενη κλήση";
"generatedMessage.missedIncomingCall" = "Αναπάντητη εισερχόμενη κλήση";
+//General Settings
+"generalSettings.title" = "General settings";
+"generalSettings.videoAcceleration" = "Enable video acceleration";
+
diff --git a/Ring/Ring/Resources/eo.lproj/Localizable.strings b/Ring/Ring/Resources/eo.lproj/Localizable.strings
index 697dd31..299670f 100644
--- a/Ring/Ring/Resources/eo.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/eo.lproj/Localizable.strings
@@ -38,7 +38,7 @@
"smartlist.searchBarPlaceholder" = "Enter name...";
"smartlist.noNetworkConnectivity" = "Sen reta konekto";
"smartlist.cellularAccess" = "Be sure cellular access is granted in your settings";
-"smartlist.accountsTitle" = "Accounts";
+"smartlist.accountsTitle" = "Kontoj";
"smartlist.addAccountButton" = "+ Add Account";
"smartlist.noNumber" = "Selected contact does not have any number";
"smartlist.selectOneNumber" = "Select one of the numbers";
@@ -164,15 +164,16 @@
"accountPage.deviceRevocationError" = "Device revocation error";
"accountPage.namePlaceholder" = "Nomo";
"accountPage.linkDeviceTitle" = "Link another device";
-"accountPage.other" = "Other";
+"accountPage.other" = "Alia";
"accountPage.removeAccountTitle" = "Remove account";
"accountPage.removeAccountMessage" = "By clicking \"Remove\" you will remove this account on this device! This action can not be undone. Also, your registered name can be lost.";
-"accountPage.removeAccountButton" = "Remove";
+"accountPage.removeAccountButton" = "Forigi";
//Account
"account.sipUsername" = "User Name";
-"account.sipPassword" = "Password";
+"account.sipPassword" = "Pasvorto";
"account.sipServer" = "SIP Server";
-"account.port" = "Port";
+"account.port" = "Pordo";
+"account.proxyServer" = "Prokura Servilo";
"account.createSipAccount" = "Create Sip Account";
"account.usernameLabel" = "Enter Username";
"account.passwordLabel" = "Enter Password";
@@ -183,7 +184,7 @@
"account.statusOnline" = "Online";
"account.statusOffline" = "Offline";
"account.statusConnecting" = "Connecting";
-"account.statusUnknown" = "Unknown";
+"account.statusUnknown" = "Nekonata";
"account.statusConnectionerror" = "Connection Error";
//Block List Page
@@ -238,3 +239,7 @@
"generatedMessage.missedOutgoingCall" = "Missed outgoing call";
"generatedMessage.missedIncomingCall" = "Missed incoming call";
+//General Settings
+"generalSettings.title" = "General settings";
+"generalSettings.videoAcceleration" = "Enable video acceleration";
+
diff --git a/Ring/Ring/Resources/es.lproj/Localizable.strings b/Ring/Ring/Resources/es.lproj/Localizable.strings
index 9409137..630b245 100644
--- a/Ring/Ring/Resources/es.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/es.lproj/Localizable.strings
@@ -39,9 +39,9 @@
"smartlist.noNetworkConnectivity" = "Sin conexión a la red";
"smartlist.cellularAccess" = "Asegúrese de que el acceso a la red móvil haya sido otorgado en las opciones";
"smartlist.accountsTitle" = "Cuentas";
-"smartlist.addAccountButton" = "+ Add Account";
-"smartlist.noNumber" = "Selected contact does not have any number";
-"smartlist.selectOneNumber" = "Select one of the numbers";
+"smartlist.addAccountButton" = "+ Añadir cuenta";
+"smartlist.noNumber" = "El contacto seleccionado no tiene ningún número";
+"smartlist.selectOneNumber" = "Seleccione uno de los números";
//Conversation
"conversation.messagePlaceholder" = "Escribe tu mensaje...";
@@ -166,25 +166,26 @@
"accountPage.linkDeviceTitle" = "Vincular otro dispositivo";
"accountPage.other" = "Otro";
"accountPage.removeAccountTitle" = "Eliminar cuenta";
-"accountPage.removeAccountMessage" = "By clicking \"Remove\" you will remove this account on this device! This action can not be undone. Also, your registered name can be lost.";
+"accountPage.removeAccountMessage" = "Al hacer click en \"Eliminar\" se eliminará esta cuenta de su dispositivo. Esta acción no podrá ser deshecha. Igualmente, su nombre registrado puede perderse.";
"accountPage.removeAccountButton" = "Eliminar";
//Account
"account.sipUsername" = "Nombre de usuario";
"account.sipPassword" = "Contraseña";
"account.sipServer" = "Servidor SIP";
"account.port" = "Puerto";
-"account.createSipAccount" = "Create Sip Account";
-"account.usernameLabel" = "Enter Username";
+"account.proxyServer" = "Proxy";
+"account.createSipAccount" = "Crear cuenta SIP";
+"account.usernameLabel" = "Introduzca nombre de usuario";
"account.passwordLabel" = "Introducir contraseña";
-"account.serverLabel" = "Enter Address";
-"account.portLabel" = "Enter Port Number";
-"account.accountStatus" = "Account Status";
-"account.enableAccount" = "Enable Account";
+"account.serverLabel" = "Introduzca dirección postal";
+"account.portLabel" = "Introduzca Número de Puerto";
+"account.accountStatus" = "Estado de la cuenta";
+"account.enableAccount" = "Activar cuenta";
"account.statusOnline" = "En línea";
"account.statusOffline" = "Desconectado";
"account.statusConnecting" = "Conectando";
"account.statusUnknown" = "Desconocido";
-"account.statusConnectionerror" = "Connection Error";
+"account.statusConnectionerror" = "Error de conexión";
//Block List Page
"blockListPage.noBlockedContacts" = "No hay contactos bloqueados";
@@ -238,3 +239,7 @@
"generatedMessage.missedOutgoingCall" = "Llamada saliente perdida";
"generatedMessage.missedIncomingCall" = "Llamada entrante perdida";
+//General Settings
+"generalSettings.title" = "Ajustes generales";
+"generalSettings.videoAcceleration" = "Enable video acceleration";
+
diff --git a/Ring/Ring/Resources/es_AR.lproj/Localizable.strings b/Ring/Ring/Resources/es_AR.lproj/Localizable.strings
index 7af9d86..c15ba82 100644
--- a/Ring/Ring/Resources/es_AR.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/es_AR.lproj/Localizable.strings
@@ -173,6 +173,7 @@
"account.sipPassword" = "Contraseña";
"account.sipServer" = "SIP Server";
"account.port" = "Puerto";
+"account.proxyServer" = "Proxy";
"account.createSipAccount" = "Create Sip Account";
"account.usernameLabel" = "Enter Username";
"account.passwordLabel" = "Introducir Contraseña";
@@ -238,3 +239,7 @@
"generatedMessage.missedOutgoingCall" = "Llamada saliente perdida";
"generatedMessage.missedIncomingCall" = "Llamada entrante perdida";
+//General Settings
+"generalSettings.title" = "General settings";
+"generalSettings.videoAcceleration" = "Enable video acceleration";
+
diff --git a/Ring/Ring/Resources/et_EE.lproj/Localizable.strings b/Ring/Ring/Resources/et_EE.lproj/Localizable.strings
index 26567bd..4267a3e 100644
--- a/Ring/Ring/Resources/et_EE.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/et_EE.lproj/Localizable.strings
@@ -34,39 +34,61 @@
"smartlist.conversations" = "Conversations";
"smartlist.searching" = "Searching...";
"smartlist.noResults" = "No results";
+"smartlist.noConversation" = "No conversations";
+"smartlist.searchBarPlaceholder" = "Enter name...";
"smartlist.noNetworkConnectivity" = "No network connectivity";
"smartlist.cellularAccess" = "Be sure cellular access is granted in your settings";
+"smartlist.accountsTitle" = "Accounts";
+"smartlist.addAccountButton" = "+ Add Account";
+"smartlist.noNumber" = "Selected contact does not have any number";
+"smartlist.selectOneNumber" = "Select one of the numbers";
+
+//Conversation
+"conversation.messagePlaceholder" = "Type your message...";
+
+//Invitations
+"invitations.noInvitations" = "No invitations";
// Walkthrough
//Welcome Screen
-"welcome.title" = "Welcome to Ring";
-"welcome.text" = "Ring is a free and universal communication platform which preserves the users' privacy and freedoms";
+"welcome.title" = "Welcome to Jami !";
+"welcome.text" = "Jami is a free and universal communication platform which preserves the users' privacy and freedoms";
"welcome.linkDevice" = "Link this device to an account";
-"welcome.createAccount" = "Create a Ring account";
+"welcome.createAccount" = "Create a Jami account";
//Creation Profile Screen
"createProfile.skipCreateProfile" = "Skip";
"createProfile.profileCreated" = "Next";
+"createProfile.title" = "Personalise your profile";
+"createProfile.enterNameLabel" = "Enter a display name";
+"createProfile.enterNamePlaceholder" = "Enter name";
+"createProfile.subtitle" = "Your profile will be shared with your contacts. You can change it at any time.";
+"createProfile.createYourAvatar" = "Create your avatar";
//Create Account form
-"createAccount.createAccountFormTitle" = "Create your Ring account";
-"createAccount.chooseStrongPassword" = "Choose strong password you will remember to protect your Ring account.";
-"createAccount.enterNewUsernamePlaceholder" = "username";
-"createAccount.newPasswordPlaceholder" = "password";
-"createAccount.repeatPasswordPlaceholder" = "confirm password";
+"createAccount.createAccountFormTitle" = "Create your account";
+"createAccount.chooseStrongPassword" = "Choose strong password you will remember to protect your Jami account.";
+"createAccount.enterNewUsernamePlaceholder" = "Username";
+"createAccount.newPasswordPlaceholder" = "Password";
+"createAccount.repeatPasswordPlaceholder" = "Confirm password";
"createAccount.passwordCharactersNumberError" = "6 characters minimum";
"createAccount.passwordNotMatchingError" = "passwords do not match";
-"createAccount.lookingForUsernameAvailability" = "looking for username availability";
+"createAccount.lookingForUsernameAvailability" = "looking for availability…";
"createAccount.invalidUsername" = "invalid username";
"createAccount.usernameAlreadyTaken" = "username already taken";
"createAccount.loading" = "Loading";
"createAccount.waitCreateAccountTitle" = "Adding account";
+"createAccount.RegisterAUsername" = "Register a username";
+"createAccount.ChooseAPassword" = "Encrypt my account";
+"createAccount.PasswordInformation" = "Choose a password to encrypt your local account. Don’t forget it or you will not be able to recover your account";
+"createAccount.EnableNotifications" = "Notifications";
+"createAccount.Recommended" = "(Recommended)";
//Link To Account form
"linkToAccount.waitLinkToAccountTitle" = "Account linking";
"linkToAccount.linkButtonTitle" = "Link device";
-"linkToAccount.passwordPlaceholder" = "password";
+"linkToAccount.passwordPlaceholder" = "Password";
"linkToAccount.pinPlaceholder" = "PIN";
"linkToAccount.passwordLabel" = "Enter Password";
"linkToAccount.pinLabel" = "Enter PIN";
@@ -74,28 +96,32 @@
//Alerts
"alerts.accountCannotBeFoundTitle" = "Can't find account";
-"alerts.accountCannotBeFoundMessage" = "Account couldn't be found on the Ring network. Make sure it was exported on Ring from an existing device, and that provided credentials are correct.";
+"alerts.accountCannotBeFoundMessage" = "Account couldn't be found on the Jami network. Make sure it was exported on Jami from an existing device, and that provided credentials are correct.";
"alerts.accountAddedTitle" = "Account Added";
"alerts.accountNoNetworkTitle" = "Can't connect to the network";
-"alerts.accountNoNetworkMessage" = "Could not add account because Ring couldn't connect to the distributed network. Check your device connectivity.";
+"alerts.accountNoNetworkMessage" = "Could not add account because Jami couldn't connect to the distributed network. Check your device connectivity.";
"alerts.accountDefaultErrorTitle" = "Unknown error";
"alerts.accountDefaultErrorMessage" = "The account couldn't be created.";
"alerts.profileTakePhoto" = "Take photo";
"alerts.profileUploadPhoto" = "Upload photo";
"alerts.profileCancelPhoto" = "Cancel";
"alerts.accountLinkedTitle" = "Linking account";
-"alerts.dbFailedTitle" = "An error happned when launching Ring";
+"alerts.dbFailedTitle" = "An error happned when launching Jami";
"alerts.dbFailedMessage" = "Please close application and try to open it again";
"alerts.confirmBlockContact" = "Are you sure you want to block this contact? The conversation history with this contact will also be deleted permanently.";
"alerts.confirmBlockContactTitle" = "Block Contact";
"alerts.confirmDeleteConversation" = "Are you sure you want to delete this conversation permanently?";
"alerts.confirmDeleteConversationFromContact" = "Are you sure you want to delete the conversation with this contact?";
"alerts.confirmDeleteConversationTitle" = "Delete Conversation";
+"alerts.confirmClearConversation" = "Are you sure you want to clear the conversation with this contact?";
+"alerts.confirmClearConversationTitle" = "Clear Conversation";
//Actions
"actions.blockAction" = "Block";
"actions.deleteAction" = "Delete";
"actions.cancelAction" = "Cancel";
+"actions.clearAction" = "Clear";
+"actions.backAction" = "Back";
"alerts.incomingCallAllertTitle" = "Incoming call from ";
"alerts.incomingCallButtonAccept" = "Accept";
"alerts.incomingCallButtonIgnore" = "Ignore";
@@ -104,8 +130,8 @@
"calls.callItemTitle" = "Call";
"calls.unknown" = "Unknown";
"calls.incomingCallInfo" = "wants to talk to you";
-"calls.ringing" = "Heliseb";
-"calls.connecting" = "Ühendab";
+"calls.ringing" = "Ringing…";
+"calls.connecting" = "Connecting…";
"calls.callFinished" = "Call finished";
//Account Page
@@ -125,13 +151,51 @@
"accountPage.enableNotifications" = "Enable Notifications";
"accountPage.proxyDisabledAlertTitle" = "Proxy Server Disabled";
"accountPage.proxyDisabledAlertBody" = "In order to receive notifications, please enable proxy";
+"accountPage.revokeDeviceTitle" = "Revoke device";
+"accountPage.revokeDeviceMessage" = "Are you sure you want to revoke this device? This action could not be undone.";
+"accountPage.revokeDeviceButton" = "Revoke";
+"accountPage.revokeDevicePlaceholder" = "Enter your passord";
+"accountPage.deviceRevoked" = "Device revocation completed";
+"accountPage.deviceRevocationProgress" = "Revoking...";
+"accountPage.deviceRevocationSuccess" = "Device was revoked";
+"accountPage.deviceRevocationTryAgain" = "Try again";
+"accountPage.deviceRevocationWrongPassword" = "Incorrect password";
+"accountPage.deviceRevocationUnknownDevice" = "Unknown device";
+"accountPage.deviceRevocationError" = "Device revocation error";
+"accountPage.namePlaceholder" = "Nimi";
+"accountPage.linkDeviceTitle" = "Link another device";
+"accountPage.other" = "Other";
+"accountPage.removeAccountTitle" = "Remove account";
+"accountPage.removeAccountMessage" = "By clicking \"Remove\" you will remove this account on this device! This action can not be undone. Also, your registered name can be lost.";
+"accountPage.removeAccountButton" = "Remove";
+//Account
+"account.sipUsername" = "User Name";
+"account.sipPassword" = "Password";
+"account.sipServer" = "SIP Server";
+"account.port" = "Port";
+"account.proxyServer" = "Proxy";
+"account.createSipAccount" = "Create Sip Account";
+"account.usernameLabel" = "Enter Username";
+"account.passwordLabel" = "Enter Password";
+"account.serverLabel" = "Enter Address";
+"account.portLabel" = "Enter Port Number";
+"account.accountStatus" = "Account Status";
+"account.enableAccount" = "Enable Account";
+"account.statusOnline" = "Online";
+"account.statusOffline" = "Offline";
+"account.statusConnecting" = "Ühendab";
+"account.statusUnknown" = "Unknown";
+"account.statusConnectionerror" = "Connection Error";
+
+//Block List Page
+"blockListPage.noBlockedContacts" = "No blocked contacts";
//Link New Device
"linkDevice.title" = "Link a new device";
"linkDevice.passwordError" = "The password you entered does not unlock this account";
"linkDevice.networkError" = "A network error occured during the export";
"linkDevice.defaultError" = "An error occured during the export";
-"linkDevice.explanationMessage" = "To complete the process, you need to open Ring on the new device and choose the option \"Link this device to an account.\" Your pin is valid for 10 minutes";
+"linkDevice.explanationMessage" = "To complete the process, you need to open Jami on the new device and choose the option \"Link this device to an account.\" Your pin is valid for 10 minutes";
"linkDevice.hudMessage" = "Verifying";
//Contact Page
@@ -140,6 +204,7 @@
"contactPage.sendMessage" = "Send Message";
"contactPage.clearConversation" = "Clear Chat";
"contactPage.blockContact" = "Block Contact";
+"contactPage.removeConversation" = "Remove Conversation";
//DataTransfer
"dataTransfer.readableStatusCreated" = "Initializing…";
@@ -152,3 +217,29 @@
"dataTransfer.readableStatusAccept" = "Accept";
"dataTransfer.readableStatusCancel" = "Cancel";
+//Notifications
+"notifications.incomingCall" = "Incoming Call";
+"notifications.missedCall" = "Missed Call";
+"notifications.acceptCall" = "ACCEPT";
+"notifications.refuseCall" = "REFUSE";
+"dataTransfer.readableStatusAwaiting" = "Pending…";
+"dataTransfer.readableStatusRefuse" = "Refuse";
+"dataTransfer.readableStatusOngoing" = "Transferring";
+"dataTransfer.readableStatusCanceled" = "Canceled";
+"dataTransfer.readableStatusSuccess" = "Complete";
+"dataTransfer.readableStatusAccept" = "Accept";
+"dataTransfer.readableStatusCancel" = "Cancel";
+
+//Generated Message
+"generatedMessage.contactAdded" = "Contact added";
+"generatedMessage.invitationReceived" = "Invitation received";
+"generatedMessage.invitationAccepted" = "Invitation accepted";
+"generatedMessage.outgoingCall" = "Outgoing call";
+"generatedMessage.incomingCall" = "Incoming call";
+"generatedMessage.missedOutgoingCall" = "Missed outgoing call";
+"generatedMessage.missedIncomingCall" = "Missed incoming call";
+
+//General Settings
+"generalSettings.title" = "General settings";
+"generalSettings.videoAcceleration" = "Enable video acceleration";
+
diff --git a/Ring/Ring/Resources/eu.lproj/Localizable.strings b/Ring/Ring/Resources/eu.lproj/Localizable.strings
index 48059de..e56ff24 100644
--- a/Ring/Ring/Resources/eu.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/eu.lproj/Localizable.strings
@@ -173,6 +173,7 @@
"account.sipPassword" = "Password";
"account.sipServer" = "SIP Server";
"account.port" = "Port";
+"account.proxyServer" = "Proxy";
"account.createSipAccount" = "Create Sip Account";
"account.usernameLabel" = "Enter Username";
"account.passwordLabel" = "Enter Password";
@@ -238,3 +239,7 @@
"generatedMessage.missedOutgoingCall" = "Missed outgoing call";
"generatedMessage.missedIncomingCall" = "Missed incoming call";
+//General Settings
+"generalSettings.title" = "General settings";
+"generalSettings.videoAcceleration" = "Enable video acceleration";
+
diff --git a/Ring/Ring/Resources/fa-IR.lproj/Localizable.strings b/Ring/Ring/Resources/fa-IR.lproj/Localizable.strings
index e2f1a82..1581abd 100644
--- a/Ring/Ring/Resources/fa-IR.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/fa-IR.lproj/Localizable.strings
@@ -173,6 +173,7 @@
"account.sipPassword" = "گذرواژه";
"account.sipServer" = "SIP Server";
"account.port" = "پرت";
+"account.proxyServer" = "پیشکار یا پروکسی";
"account.createSipAccount" = "Create Sip Account";
"account.usernameLabel" = "Enter Username";
"account.passwordLabel" = "گذرواژه را وارد کنید";
@@ -238,3 +239,7 @@
"generatedMessage.missedOutgoingCall" = "تماس خروجی از دست رفته";
"generatedMessage.missedIncomingCall" = "تماس ورودی از دست رفته";
+//General Settings
+"generalSettings.title" = "تنظیمات کلی";
+"generalSettings.videoAcceleration" = "Enable video acceleration";
+
diff --git a/Ring/Ring/Resources/fi.lproj/Localizable.strings b/Ring/Ring/Resources/fi.lproj/Localizable.strings
index c1f602a..c08e58f 100644
--- a/Ring/Ring/Resources/fi.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/fi.lproj/Localizable.strings
@@ -173,6 +173,7 @@
"account.sipPassword" = "Salasana";
"account.sipServer" = "SIP Server";
"account.port" = "Portti";
+"account.proxyServer" = "Välityspalvelin";
"account.createSipAccount" = "Create Sip Account";
"account.usernameLabel" = "Enter Username";
"account.passwordLabel" = "Syötä salasana";
@@ -238,3 +239,7 @@
"generatedMessage.missedOutgoingCall" = "Missed outgoing call";
"generatedMessage.missedIncomingCall" = "Missed incoming call";
+//General Settings
+"generalSettings.title" = "General settings";
+"generalSettings.videoAcceleration" = "Enable video acceleration";
+
diff --git a/Ring/Ring/Resources/fr-BE.lproj/Localizable.strings b/Ring/Ring/Resources/fr-BE.lproj/Localizable.strings
index e16538f..7a40214 100644
--- a/Ring/Ring/Resources/fr-BE.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/fr-BE.lproj/Localizable.strings
@@ -173,6 +173,7 @@
"account.sipPassword" = "Password";
"account.sipServer" = "SIP Server";
"account.port" = "Port";
+"account.proxyServer" = "Proxy";
"account.createSipAccount" = "Create Sip Account";
"account.usernameLabel" = "Enter Username";
"account.passwordLabel" = "Enter Password";
@@ -238,3 +239,7 @@
"generatedMessage.missedOutgoingCall" = "Missed outgoing call";
"generatedMessage.missedIncomingCall" = "Missed incoming call";
+//General Settings
+"generalSettings.title" = "General settings";
+"generalSettings.videoAcceleration" = "Enable video acceleration";
+
diff --git a/Ring/Ring/Resources/fr-CA.lproj/Localizable.strings b/Ring/Ring/Resources/fr-CA.lproj/Localizable.strings
index 7796d9b..30504f8 100644
--- a/Ring/Ring/Resources/fr-CA.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/fr-CA.lproj/Localizable.strings
@@ -173,6 +173,7 @@
"account.sipPassword" = "Mot de passe";
"account.sipServer" = "SIP Server";
"account.port" = "Port";
+"account.proxyServer" = "Proxy";
"account.createSipAccount" = "Create Sip Account";
"account.usernameLabel" = "Enter Username";
"account.passwordLabel" = "Entrer le mot-de-passe";
@@ -238,3 +239,7 @@
"generatedMessage.missedOutgoingCall" = "Appel sortant manqué";
"generatedMessage.missedIncomingCall" = "Appel entrant manqué";
+//General Settings
+"generalSettings.title" = "General settings";
+"generalSettings.videoAcceleration" = "Enable video acceleration";
+
diff --git a/Ring/Ring/Resources/fr-CH.lproj/Localizable.strings b/Ring/Ring/Resources/fr-CH.lproj/Localizable.strings
index e16538f..7a40214 100644
--- a/Ring/Ring/Resources/fr-CH.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/fr-CH.lproj/Localizable.strings
@@ -173,6 +173,7 @@
"account.sipPassword" = "Password";
"account.sipServer" = "SIP Server";
"account.port" = "Port";
+"account.proxyServer" = "Proxy";
"account.createSipAccount" = "Create Sip Account";
"account.usernameLabel" = "Enter Username";
"account.passwordLabel" = "Enter Password";
@@ -238,3 +239,7 @@
"generatedMessage.missedOutgoingCall" = "Missed outgoing call";
"generatedMessage.missedIncomingCall" = "Missed incoming call";
+//General Settings
+"generalSettings.title" = "General settings";
+"generalSettings.videoAcceleration" = "Enable video acceleration";
+
diff --git a/Ring/Ring/Resources/fr-FR.lproj/Localizable.strings b/Ring/Ring/Resources/fr-FR.lproj/Localizable.strings
index ce2ec89..c22f488 100644
--- a/Ring/Ring/Resources/fr-FR.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/fr-FR.lproj/Localizable.strings
@@ -38,7 +38,7 @@
"smartlist.searchBarPlaceholder" = "Enter name...";
"smartlist.noNetworkConnectivity" = "Aucune connexion au réseau n'est possible";
"smartlist.cellularAccess" = "Assurez vous que l'accès mobile est activé dans vos paramètres";
-"smartlist.accountsTitle" = "Accounts";
+"smartlist.accountsTitle" = "Comptes";
"smartlist.addAccountButton" = "+ Add Account";
"smartlist.noNumber" = "Selected contact does not have any number";
"smartlist.selectOneNumber" = "Select one of the numbers";
@@ -121,7 +121,7 @@
"actions.deleteAction" = "Supprimer";
"actions.cancelAction" = "Annuler";
"actions.clearAction" = "Clear";
-"actions.backAction" = "Back";
+"actions.backAction" = "Retour";
"alerts.incomingCallAllertTitle" = "Incoming call from ";
"alerts.incomingCallButtonAccept" = "Accepter";
"alerts.incomingCallButtonIgnore" = "Ignorer";
@@ -164,18 +164,19 @@
"accountPage.deviceRevocationError" = "Device revocation error";
"accountPage.namePlaceholder" = "Nom";
"accountPage.linkDeviceTitle" = "Link another device";
-"accountPage.other" = "Other";
+"accountPage.other" = "Autre";
"accountPage.removeAccountTitle" = "Remove account";
"accountPage.removeAccountMessage" = "By clicking \"Remove\" you will remove this account on this device! This action can not be undone. Also, your registered name can be lost.";
"accountPage.removeAccountButton" = "Remove";
//Account
"account.sipUsername" = "User Name";
-"account.sipPassword" = "Password";
+"account.sipPassword" = "mot de passe";
"account.sipServer" = "SIP Server";
"account.port" = "Port";
+"account.proxyServer" = "Proxy";
"account.createSipAccount" = "Create Sip Account";
"account.usernameLabel" = "Enter Username";
-"account.passwordLabel" = "Enter Password";
+"account.passwordLabel" = "Saisissez le mot de passe";
"account.serverLabel" = "Enter Address";
"account.portLabel" = "Enter Port Number";
"account.accountStatus" = "Account Status";
@@ -183,7 +184,7 @@
"account.statusOnline" = "Online";
"account.statusOffline" = "Offline";
"account.statusConnecting" = "Connecting";
-"account.statusUnknown" = "Unknown";
+"account.statusUnknown" = "Inconnu";
"account.statusConnectionerror" = "Connection Error";
//Block List Page
@@ -238,3 +239,7 @@
"generatedMessage.missedOutgoingCall" = "Missed outgoing call";
"generatedMessage.missedIncomingCall" = "Missed incoming call";
+//General Settings
+"generalSettings.title" = "General settings";
+"generalSettings.videoAcceleration" = "Enable video acceleration";
+
diff --git a/Ring/Ring/Resources/fr.lproj/Localizable.strings b/Ring/Ring/Resources/fr.lproj/Localizable.strings
index 4d8daf5..c08e790 100644
--- a/Ring/Ring/Resources/fr.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/fr.lproj/Localizable.strings
@@ -173,6 +173,7 @@
"account.sipPassword" = "Mot de passe";
"account.sipServer" = "Adresse du serveur SIP";
"account.port" = "Port";
+"account.proxyServer" = "Serveur mandataire";
"account.createSipAccount" = "Create Sip Account";
"account.usernameLabel" = "Enter Username";
"account.passwordLabel" = "Entrez le mot de passe";
@@ -238,3 +239,7 @@
"generatedMessage.missedOutgoingCall" = "Appel sortant manqué";
"generatedMessage.missedIncomingCall" = "Appel entrant manqué";
+//General Settings
+"generalSettings.title" = "Paramètres généraux";
+"generalSettings.videoAcceleration" = "Enable video acceleration";
+
diff --git a/Ring/Ring/Resources/he.lproj/Localizable.strings b/Ring/Ring/Resources/he.lproj/Localizable.strings
index be70bff..76b3c9f 100644
--- a/Ring/Ring/Resources/he.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/he.lproj/Localizable.strings
@@ -173,6 +173,7 @@
"account.sipPassword" = "סיסמה";
"account.sipServer" = "SIP Server";
"account.port" = "פורט";
+"account.proxyServer" = "פרוקסי";
"account.createSipAccount" = "Create Sip Account";
"account.usernameLabel" = "Enter Username";
"account.passwordLabel" = "Enter Password";
@@ -238,3 +239,7 @@
"generatedMessage.missedOutgoingCall" = "Missed outgoing call";
"generatedMessage.missedIncomingCall" = "Missed incoming call";
+//General Settings
+"generalSettings.title" = "General settings";
+"generalSettings.videoAcceleration" = "Enable video acceleration";
+
diff --git a/Ring/Ring/Resources/hi-IN.lproj/Localizable.strings b/Ring/Ring/Resources/hi-IN.lproj/Localizable.strings
index 0ebd536..f603ed3 100644
--- a/Ring/Ring/Resources/hi-IN.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/hi-IN.lproj/Localizable.strings
@@ -173,6 +173,7 @@
"account.sipPassword" = "Password";
"account.sipServer" = "SIP Server";
"account.port" = "Port";
+"account.proxyServer" = "Proxy";
"account.createSipAccount" = "Create Sip Account";
"account.usernameLabel" = "Enter Username";
"account.passwordLabel" = "Enter Password";
@@ -238,3 +239,7 @@
"generatedMessage.missedOutgoingCall" = "Missed outgoing call";
"generatedMessage.missedIncomingCall" = "Missed incoming call";
+//General Settings
+"generalSettings.title" = "General settings";
+"generalSettings.videoAcceleration" = "Enable video acceleration";
+
diff --git a/Ring/Ring/Resources/hr.lproj/Localizable.strings b/Ring/Ring/Resources/hr.lproj/Localizable.strings
index 029c6e6..1e02092 100644
--- a/Ring/Ring/Resources/hr.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/hr.lproj/Localizable.strings
@@ -173,6 +173,7 @@
"account.sipPassword" = "Lozinka";
"account.sipServer" = "SIP Server";
"account.port" = "Port";
+"account.proxyServer" = "Proxy";
"account.createSipAccount" = "Create Sip Account";
"account.usernameLabel" = "Enter Username";
"account.passwordLabel" = "Enter Password";
@@ -238,3 +239,7 @@
"generatedMessage.missedOutgoingCall" = "Propušteni odlazni poziv";
"generatedMessage.missedIncomingCall" = "Propušteni dolazni poziv";
+//General Settings
+"generalSettings.title" = "General settings";
+"generalSettings.videoAcceleration" = "Enable video acceleration";
+
diff --git a/Ring/Ring/Resources/hu.lproj/Localizable.strings b/Ring/Ring/Resources/hu.lproj/Localizable.strings
index ae83618..cc202cc 100644
--- a/Ring/Ring/Resources/hu.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/hu.lproj/Localizable.strings
@@ -39,9 +39,9 @@
"smartlist.noNetworkConnectivity" = "Nincs hálózati csatlakozás";
"smartlist.cellularAccess" = "Győződjön meg róla, hogy a mobilhálózati hozzáférést a beállításai biztosítják";
"smartlist.accountsTitle" = "Fiókok";
-"smartlist.addAccountButton" = "+ Add Account";
-"smartlist.noNumber" = "Selected contact does not have any number";
-"smartlist.selectOneNumber" = "Select one of the numbers";
+"smartlist.addAccountButton" = "+ Fiók hozzáadása";
+"smartlist.noNumber" = "A kiválasztott kapcsolatnak nincs SIP-száma";
+"smartlist.selectOneNumber" = "Válasszon egy számot";
//Conversation
"conversation.messagePlaceholder" = "Üzenet írása…";
@@ -166,25 +166,26 @@
"accountPage.linkDeviceTitle" = "Csatlakoztasson másik eszközt";
"accountPage.other" = "Másik";
"accountPage.removeAccountTitle" = "Fiók eltávolítása";
-"accountPage.removeAccountMessage" = "By clicking \"Remove\" you will remove this account on this device! This action can not be undone. Also, your registered name can be lost.";
+"accountPage.removeAccountMessage" = "Szeretné eltávolítani ezt a fiókot ezen az eszközön? Óvatosan, ez eltávolítja a fiókot és a regisztrált neve elveszhet. Ez nem vonható vissza.";
"accountPage.removeAccountButton" = "Eltávolítás";
//Account
"account.sipUsername" = "Felhasználónév";
"account.sipPassword" = "Jelszó";
"account.sipServer" = "SIP-kiszolgáló";
-"account.port" = "Port";
-"account.createSipAccount" = "Create Sip Account";
-"account.usernameLabel" = "Enter Username";
+"account.port" = "Kikötő";
+"account.proxyServer" = "Meghatalmazott";
+"account.createSipAccount" = "SIP fiók létrehozása";
+"account.usernameLabel" = "Felhasználónév megadása";
"account.passwordLabel" = "A jelszó megadása";
-"account.serverLabel" = "Enter Address";
-"account.portLabel" = "Enter Port Number";
-"account.accountStatus" = "Account Status";
-"account.enableAccount" = "Enable Account";
+"account.serverLabel" = "Cím beírása";
+"account.portLabel" = "Kikötőszám megadása";
+"account.accountStatus" = "Fiók állapota";
+"account.enableAccount" = "Fiók engedélyezése";
"account.statusOnline" = "Elérhető";
"account.statusOffline" = "Nem elérhető";
"account.statusConnecting" = "Kapcsolódás";
"account.statusUnknown" = "Ismeretlen";
-"account.statusConnectionerror" = "Connection Error";
+"account.statusConnectionerror" = "Csatlakozási hiba";
//Block List Page
"blockListPage.noBlockedContacts" = "Nincsenek letiltott kapcsolatok";
@@ -238,3 +239,7 @@
"generatedMessage.missedOutgoingCall" = "Nem fogadott kimenő hívás";
"generatedMessage.missedIncomingCall" = "Nem fogadott bejövő hívás";
+//General Settings
+"generalSettings.title" = "Általános beállítások";
+"generalSettings.videoAcceleration" = "Enable video acceleration";
+
diff --git a/Ring/Ring/Resources/id.lproj/Localizable.strings b/Ring/Ring/Resources/id.lproj/Localizable.strings
index 73edebc..7023b7b 100644
--- a/Ring/Ring/Resources/id.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/id.lproj/Localizable.strings
@@ -173,6 +173,7 @@
"account.sipPassword" = "Password";
"account.sipServer" = "SIP Server";
"account.port" = "Port";
+"account.proxyServer" = "Proxy";
"account.createSipAccount" = "Create Sip Account";
"account.usernameLabel" = "Enter Username";
"account.passwordLabel" = "Enter Password";
@@ -238,3 +239,7 @@
"generatedMessage.missedOutgoingCall" = "Missed outgoing call";
"generatedMessage.missedIncomingCall" = "Missed incoming call";
+//General Settings
+"generalSettings.title" = "General settings";
+"generalSettings.videoAcceleration" = "Enable video acceleration";
+
diff --git a/Ring/Ring/Resources/it-IT.lproj/Localizable.strings b/Ring/Ring/Resources/it-IT.lproj/Localizable.strings
index 840e28a..5abb277 100644
--- a/Ring/Ring/Resources/it-IT.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/it-IT.lproj/Localizable.strings
@@ -58,7 +58,7 @@
"welcome.createAccount" = "Crea un account Jami";
//Creation Profile Screen
-"createProfile.skipCreateProfile" = "Skip";
+"createProfile.skipCreateProfile" = "Salta";
"createProfile.profileCreated" = "Prossimo";
"createProfile.title" = "Personalise your profile";
"createProfile.enterNameLabel" = "Enter a display name";
@@ -121,7 +121,7 @@
"actions.deleteAction" = "Elimina";
"actions.cancelAction" = "Annulla";
"actions.clearAction" = "Clear";
-"actions.backAction" = "Back";
+"actions.backAction" = "Indietro";
"alerts.incomingCallAllertTitle" = "Incoming call from ";
"alerts.incomingCallButtonAccept" = "Accetta";
"alerts.incomingCallButtonIgnore" = "Ignora";
@@ -164,26 +164,27 @@
"accountPage.deviceRevocationError" = "Device revocation error";
"accountPage.namePlaceholder" = "Nome";
"accountPage.linkDeviceTitle" = "Collega un altro dispositivo";
-"accountPage.other" = "Other";
+"accountPage.other" = "Altro";
"accountPage.removeAccountTitle" = "Remove account";
"accountPage.removeAccountMessage" = "By clicking \"Remove\" you will remove this account on this device! This action can not be undone. Also, your registered name can be lost.";
-"accountPage.removeAccountButton" = "Remove";
+"accountPage.removeAccountButton" = "Rimuovi";
//Account
"account.sipUsername" = "User Name";
"account.sipPassword" = "Password";
"account.sipServer" = "SIP Server";
-"account.port" = "Port";
+"account.port" = "Porta";
+"account.proxyServer" = "Proxy";
"account.createSipAccount" = "Create Sip Account";
"account.usernameLabel" = "Enter Username";
-"account.passwordLabel" = "Enter Password";
+"account.passwordLabel" = "Inserire la password";
"account.serverLabel" = "Enter Address";
"account.portLabel" = "Enter Port Number";
"account.accountStatus" = "Account Status";
"account.enableAccount" = "Enable Account";
-"account.statusOnline" = "Online";
-"account.statusOffline" = "Offline";
-"account.statusConnecting" = "Connecting";
-"account.statusUnknown" = "Unknown";
+"account.statusOnline" = "In linea";
+"account.statusOffline" = "Disconnesso";
+"account.statusConnecting" = "Collegamento";
+"account.statusUnknown" = "Sconosciuto";
"account.statusConnectionerror" = "Connection Error";
//Block List Page
@@ -230,11 +231,15 @@
"dataTransfer.readableStatusCancel" = "Annulla";
//Generated Message
-"generatedMessage.contactAdded" = "Contact added";
-"generatedMessage.invitationReceived" = "Invitation received";
-"generatedMessage.invitationAccepted" = "Invitation accepted";
+"generatedMessage.contactAdded" = "Contatto aggiunto";
+"generatedMessage.invitationReceived" = "Invito ricevuto";
+"generatedMessage.invitationAccepted" = "Invito accettato";
"generatedMessage.outgoingCall" = "Chiamata in uscita";
"generatedMessage.incomingCall" = "Chiamata in arrivo";
"generatedMessage.missedOutgoingCall" = "Chiamata persa in uscita";
"generatedMessage.missedIncomingCall" = "Chiamata persa in arrivo";
+//General Settings
+"generalSettings.title" = "Impostazioni generali";
+"generalSettings.videoAcceleration" = "Enable video acceleration";
+
diff --git a/Ring/Ring/Resources/it.lproj/Localizable.strings b/Ring/Ring/Resources/it.lproj/Localizable.strings
index 6c3cb55..8a3a9b6 100644
--- a/Ring/Ring/Resources/it.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/it.lproj/Localizable.strings
@@ -173,6 +173,7 @@
"account.sipPassword" = "Password";
"account.sipServer" = "SIP Server";
"account.port" = "Porta";
+"account.proxyServer" = "Proxy";
"account.createSipAccount" = "Create Sip Account";
"account.usernameLabel" = "Enter Username";
"account.passwordLabel" = "Enter Password";
@@ -238,3 +239,7 @@
"generatedMessage.missedOutgoingCall" = "Chiamata in uscita persa";
"generatedMessage.missedIncomingCall" = "Chiamata in entrata persa";
+//General Settings
+"generalSettings.title" = "Impostazioni generali";
+"generalSettings.videoAcceleration" = "Enable video acceleration";
+
diff --git a/Ring/Ring/Resources/ja.lproj/Localizable.strings b/Ring/Ring/Resources/ja.lproj/Localizable.strings
index dd72c2e..e902e57 100644
--- a/Ring/Ring/Resources/ja.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ja.lproj/Localizable.strings
@@ -173,6 +173,7 @@
"account.sipPassword" = "パスワード";
"account.sipServer" = "SIP Server";
"account.port" = "ポート番号";
+"account.proxyServer" = "プロキシ";
"account.createSipAccount" = "Create Sip Account";
"account.usernameLabel" = "Enter Username";
"account.passwordLabel" = "Enter Password";
@@ -238,3 +239,7 @@
"generatedMessage.missedOutgoingCall" = "不在発信";
"generatedMessage.missedIncomingCall" = "不在着信";
+//General Settings
+"generalSettings.title" = "General settings";
+"generalSettings.videoAcceleration" = "Enable video acceleration";
+
diff --git a/Ring/Ring/Resources/ko-KR.lproj/Localizable.strings b/Ring/Ring/Resources/ko-KR.lproj/Localizable.strings
index 00ea872..450899a 100644
--- a/Ring/Ring/Resources/ko-KR.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ko-KR.lproj/Localizable.strings
@@ -173,6 +173,7 @@
"account.sipPassword" = "암호";
"account.sipServer" = "SIP Server";
"account.port" = "포트";
+"account.proxyServer" = "프록시";
"account.createSipAccount" = "Create Sip Account";
"account.usernameLabel" = "Enter Username";
"account.passwordLabel" = "Enter Password";
@@ -238,3 +239,7 @@
"generatedMessage.missedOutgoingCall" = "Missed outgoing call";
"generatedMessage.missedIncomingCall" = "Missed incoming call";
+//General Settings
+"generalSettings.title" = "General settings";
+"generalSettings.videoAcceleration" = "Enable video acceleration";
+
diff --git a/Ring/Ring/Resources/lt.lproj/Localizable.strings b/Ring/Ring/Resources/lt.lproj/Localizable.strings
index fdfe6d0..ac49d39 100644
--- a/Ring/Ring/Resources/lt.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/lt.lproj/Localizable.strings
@@ -39,7 +39,7 @@
"smartlist.noNetworkConnectivity" = "Nėra tinklo ryšio";
"smartlist.cellularAccess" = "Be sure cellular access is granted in your settings";
"smartlist.accountsTitle" = "Paskyros";
-"smartlist.addAccountButton" = "+ Add Account";
+"smartlist.addAccountButton" = "+ Pridėti paskyrą";
"smartlist.noNumber" = "Selected contact does not have any number";
"smartlist.selectOneNumber" = "Select one of the numbers";
@@ -169,10 +169,11 @@
"accountPage.removeAccountMessage" = "By clicking \"Remove\" you will remove this account on this device! This action can not be undone. Also, your registered name can be lost.";
"accountPage.removeAccountButton" = "Šalinti";
//Account
-"account.sipUsername" = "User Name";
+"account.sipUsername" = "Naudotojo vardas";
"account.sipPassword" = "Slaptažodis";
-"account.sipServer" = "SIP Server";
+"account.sipServer" = "SIP serveris";
"account.port" = "Prievadas";
+"account.proxyServer" = "Įgaliotasis serveris";
"account.createSipAccount" = "Create Sip Account";
"account.usernameLabel" = "Enter Username";
"account.passwordLabel" = "Enter Password";
@@ -184,7 +185,7 @@
"account.statusOffline" = "Atsijungęs";
"account.statusConnecting" = "Sujungiama";
"account.statusUnknown" = "Nežinomas";
-"account.statusConnectionerror" = "Connection Error";
+"account.statusConnectionerror" = "Ryšio klaida";
//Block List Page
"blockListPage.noBlockedContacts" = "Užblokuotų kontaktų nėra";
@@ -238,3 +239,7 @@
"generatedMessage.missedOutgoingCall" = "Missed outgoing call";
"generatedMessage.missedIncomingCall" = "Praleistas gaunamasis skambutis";
+//General Settings
+"generalSettings.title" = "Bendri nustatymai";
+"generalSettings.videoAcceleration" = "Enable video acceleration";
+
diff --git a/Ring/Ring/Resources/ms.lproj/Localizable.strings b/Ring/Ring/Resources/ms.lproj/Localizable.strings
index 39c5648..3f18583 100644
--- a/Ring/Ring/Resources/ms.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ms.lproj/Localizable.strings
@@ -173,6 +173,7 @@
"account.sipPassword" = "Kara laluan";
"account.sipServer" = "SIP Server";
"account.port" = "Port";
+"account.proxyServer" = "Proksi";
"account.createSipAccount" = "Create Sip Account";
"account.usernameLabel" = "Enter Username";
"account.passwordLabel" = "Enter Password";
@@ -238,3 +239,7 @@
"generatedMessage.missedOutgoingCall" = "Missed outgoing call";
"generatedMessage.missedIncomingCall" = "Missed incoming call";
+//General Settings
+"generalSettings.title" = "General settings";
+"generalSettings.videoAcceleration" = "Enable video acceleration";
+
diff --git a/Ring/Ring/Resources/nb.lproj/Localizable.strings b/Ring/Ring/Resources/nb.lproj/Localizable.strings
index 4b690a0..9815012 100644
--- a/Ring/Ring/Resources/nb.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/nb.lproj/Localizable.strings
@@ -173,6 +173,7 @@
"account.sipPassword" = "Passord";
"account.sipServer" = "SIP Server";
"account.port" = "Port";
+"account.proxyServer" = "Mellomtjener";
"account.createSipAccount" = "Create Sip Account";
"account.usernameLabel" = "Enter Username";
"account.passwordLabel" = "Skriv inn passord";
@@ -238,3 +239,7 @@
"generatedMessage.missedOutgoingCall" = "Tapt utgående anrop";
"generatedMessage.missedIncomingCall" = "Tapt innkommende anrop";
+//General Settings
+"generalSettings.title" = "General settings";
+"generalSettings.videoAcceleration" = "Enable video acceleration";
+
diff --git a/Ring/Ring/Resources/nl-NL.lproj/Localizable.strings b/Ring/Ring/Resources/nl-NL.lproj/Localizable.strings
index 5355ade..cc0ca42 100644
--- a/Ring/Ring/Resources/nl-NL.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/nl-NL.lproj/Localizable.strings
@@ -173,6 +173,7 @@
"account.sipPassword" = "Wachtwoord";
"account.sipServer" = "SIP Server";
"account.port" = "Port";
+"account.proxyServer" = "Proxy";
"account.createSipAccount" = "Create Sip Account";
"account.usernameLabel" = "Enter Username";
"account.passwordLabel" = "Enter Password";
@@ -238,3 +239,7 @@
"generatedMessage.missedOutgoingCall" = "Missed outgoing call";
"generatedMessage.missedIncomingCall" = "Missed incoming call";
+//General Settings
+"generalSettings.title" = "General settings";
+"generalSettings.videoAcceleration" = "Enable video acceleration";
+
diff --git a/Ring/Ring/Resources/nl.lproj/Localizable.strings b/Ring/Ring/Resources/nl.lproj/Localizable.strings
index 70ee95d..6461a6d 100644
--- a/Ring/Ring/Resources/nl.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/nl.lproj/Localizable.strings
@@ -25,8 +25,8 @@
"global.ok" = "Oké";
// Scan
-"scan.badQrCode" = "Bad QR code";
-"scan.search" = "Searching…";
+"scan.badQrCode" = "Verkeerde QR-code";
+"scan.search" = "Beizg met zoeken…";
// Smartlist
"smartlist.yesterday" = "Gisteren";
@@ -34,56 +34,56 @@
"smartlist.conversations" = "Gesprekken";
"smartlist.searching" = "Zoeken…";
"smartlist.noResults" = "Geen resultaten";
-"smartlist.noConversation" = "No conversations";
-"smartlist.searchBarPlaceholder" = "Enter name...";
+"smartlist.noConversation" = "Geen gesprekken";
+"smartlist.searchBarPlaceholder" = "Voer naam in…";
"smartlist.noNetworkConnectivity" = "Geen netwerkverbinding";
-"smartlist.cellularAccess" = "Zorg dat je toegang tot het mobiele netwerk toegestaan hebt in je instellingen";
+"smartlist.cellularAccess" = "Zorg dat u toegang tot het mobiele netwerk toegestaan heeft in uw instellingen";
"smartlist.accountsTitle" = "Accounts";
-"smartlist.addAccountButton" = "+ Add Account";
-"smartlist.noNumber" = "Selected contact does not have any number";
-"smartlist.selectOneNumber" = "Select one of the numbers";
+"smartlist.addAccountButton" = "+ Account toevoegen";
+"smartlist.noNumber" = "Het geselecteerde contact heeft geen nummer";
+"smartlist.selectOneNumber" = "Kies één van de nummers";
//Conversation
-"conversation.messagePlaceholder" = "Type your message...";
+"conversation.messagePlaceholder" = "Typ uw bericht…";
//Invitations
-"invitations.noInvitations" = "No invitations";
+"invitations.noInvitations" = "Geen uitnodigingen";
// Walkthrough
//Welcome Screen
-"welcome.title" = "Welcome to Jami !";
-"welcome.text" = "Jami is a free and universal communication platform which preserves the users' privacy and freedoms";
+"welcome.title" = "Welkom bij Jami!";
+"welcome.text" = "Jami is een vrij en universeel communicatieplatform, dat de privacy en vrijheden van haar gebruikers eerbiedigt";
"welcome.linkDevice" = "Dit apparaat aan een account koppelen";
-"welcome.createAccount" = "Create a Jami account";
+"welcome.createAccount" = "Een Jami-account aanmaken";
//Creation Profile Screen
"createProfile.skipCreateProfile" = "Overslaan";
"createProfile.profileCreated" = "Volgende";
-"createProfile.title" = "Personalise your profile";
-"createProfile.enterNameLabel" = "Enter a display name";
-"createProfile.enterNamePlaceholder" = "Enter name";
-"createProfile.subtitle" = "Your profile will be shared with your contacts. You can change it at any time.";
-"createProfile.createYourAvatar" = "Create your avatar";
+"createProfile.title" = "Personaliseer uw profiel";
+"createProfile.enterNameLabel" = "Voer een weergavenaam in";
+"createProfile.enterNamePlaceholder" = "Voer naam in";
+"createProfile.subtitle" = "Uw profiel wordt gedeeld met uw contacten. U kunt het op elk moment wijzigen.";
+"createProfile.createYourAvatar" = "Maak uw avatar aan";
//Create Account form
-"createAccount.createAccountFormTitle" = "Maak je account aan";
-"createAccount.chooseStrongPassword" = "Choose strong password you will remember to protect your Jami account.";
+"createAccount.createAccountFormTitle" = "Maak uw account aan";
+"createAccount.chooseStrongPassword" = "Kies een sterk wachtwoord om uw Jami-account te beschermen.";
"createAccount.enterNewUsernamePlaceholder" = "Gebruikersnaam";
"createAccount.newPasswordPlaceholder" = "Wachtwoord";
"createAccount.repeatPasswordPlaceholder" = "Bevestig wachtwoord";
"createAccount.passwordCharactersNumberError" = "Minimaal 6 tekens";
"createAccount.passwordNotMatchingError" = "wachtwoorden komen niet overeen";
-"createAccount.lookingForUsernameAvailability" = "looking for availability…";
+"createAccount.lookingForUsernameAvailability" = "beschikbaarheid wordt gecontroleerd…";
"createAccount.invalidUsername" = "ongeldige gebruikersnaam";
"createAccount.usernameAlreadyTaken" = "gebruikersnaam reeds in gebruik";
"createAccount.loading" = "Laden";
"createAccount.waitCreateAccountTitle" = "Account wordt toegevoegd";
-"createAccount.RegisterAUsername" = "Register a username";
-"createAccount.ChooseAPassword" = "Encrypt my account";
-"createAccount.PasswordInformation" = "Choose a password to encrypt your local account. Don’t forget it or you will not be able to recover your account";
-"createAccount.EnableNotifications" = "Notifications";
-"createAccount.Recommended" = "(Recommended)";
+"createAccount.RegisterAUsername" = "Een gebruikersnaam registreren";
+"createAccount.ChooseAPassword" = "Mijn account versleutelen";
+"createAccount.PasswordInformation" = "Kies een wachtwoord om uw lokale account mee te versleutelen. Vergeet het niet, u zult uw account anders niet kunnen herstellen";
+"createAccount.EnableNotifications" = "Meldingen";
+"createAccount.Recommended" = "(Aanbevolen)";
//Link To Account form
"linkToAccount.waitLinkToAccountTitle" = "Account koppelen";
@@ -92,46 +92,46 @@
"linkToAccount.pinPlaceholder" = "Pincode";
"linkToAccount.passwordLabel" = "Voer wachtwoord in";
"linkToAccount.pinLabel" = "Voer pincode in";
-"linkToAccount.explanationPinMessage" = "Ga naar de accountbeheerinstellingen op het apparaat dat de account bevat die je wil gebruiken om de pincode te genereren. Selecteer ‘Een ander apparaat aan deze account koppelen’. Je zal de pincode krijgen die je nodig hebt om dit proces te voltooien. De pincode is slechts 10 minuten geldig.";
+"linkToAccount.explanationPinMessage" = "Om de pincode te genereren, gaat u naar de accountbeheerinstellingen op het apparaat dat het account bevat dat u wilt gebruiken. Selecteer ‘Een ander apparaat aan dit account koppelen’. U zult de pincode krijgen die u nodig heeft om dit proces te voltooien. De pincode is slechts 10 minuten geldig.";
//Alerts
"alerts.accountCannotBeFoundTitle" = "Account kan niet gevonden worden";
-"alerts.accountCannotBeFoundMessage" = "Account couldn't be found on the Jami network. Make sure it was exported on Jami from an existing device, and that provided credentials are correct.";
+"alerts.accountCannotBeFoundMessage" = "Account kon niet gevonden worden op het Jami-netwerk. Controleer of het account geëxporteerd is van een bestaand apparaat en dat de ingevoerde gebruikersreferenties correct zijn.";
"alerts.accountAddedTitle" = "Account toegevoegd";
"alerts.accountNoNetworkTitle" = "Kan geen verbinding maken met het netwerk";
-"alerts.accountNoNetworkMessage" = "Could not add account because Jami couldn't connect to the distributed network. Check your device connectivity.";
+"alerts.accountNoNetworkMessage" = "Kon het account niet toevoegen omdat Jami geen verbinding kon maken met het gedistribueerde netwerk. Controleer de netwerkverbinding van uw apparaat.";
"alerts.accountDefaultErrorTitle" = "Onbekende fout";
-"alerts.accountDefaultErrorMessage" = "De account kon niet aangemaakt worden.";
+"alerts.accountDefaultErrorMessage" = "Het account kon niet aangemaakt worden.";
"alerts.profileTakePhoto" = "Foto nemen";
"alerts.profileUploadPhoto" = "Foto uploaden";
"alerts.profileCancelPhoto" = "Annuleren";
"alerts.accountLinkedTitle" = "Account koppelen";
-"alerts.dbFailedTitle" = "An error happned when launching Jami";
+"alerts.dbFailedTitle" = "Er trad een fout op bij het starten van Jami";
"alerts.dbFailedMessage" = "Sluit de toepassing en probeer het opnieuw";
-"alerts.confirmBlockContact" = "Weet je zeker dat je dit contact wil blokkeren? De gespreksgeschiedenis met dit contact zal ook voorgoed verwijderd worden.";
+"alerts.confirmBlockContact" = "Weet u zeker dat u dit contact wilt blokkeren? De gespreksgeschiedenis met dit contact zal ook voorgoed verwijderd worden.";
"alerts.confirmBlockContactTitle" = "Contact blokkeren";
-"alerts.confirmDeleteConversation" = "Weet je zeker dat je dit gesprek voorgoed wil verwijderen?";
-"alerts.confirmDeleteConversationFromContact" = "Weet je zeker dat je het gesprek met dit contact wil verwijderen?";
+"alerts.confirmDeleteConversation" = "Weet u zeker dat u dit gesprek voorgoed wilt verwijderen?";
+"alerts.confirmDeleteConversationFromContact" = "Weet u zeker dat u het gesprek met dit contact wilt verwijderen?";
"alerts.confirmDeleteConversationTitle" = "Gesprek verwijderen";
-"alerts.confirmClearConversation" = "Are you sure you want to clear the conversation with this contact?";
-"alerts.confirmClearConversationTitle" = "Clear Conversation";
+"alerts.confirmClearConversation" = "Weet u zeker dat u het gesprek met dit contact wilt verwijderen?";
+"alerts.confirmClearConversationTitle" = "Gesprek wissen";
//Actions
"actions.blockAction" = "Blokkeren";
"actions.deleteAction" = "Verwijderen";
"actions.cancelAction" = "Annuleren";
-"actions.clearAction" = "Clear";
+"actions.clearAction" = "Wissen";
"actions.backAction" = "Terug";
"alerts.incomingCallAllertTitle" = "Inkomende oproep van";
-"alerts.incomingCallButtonAccept" = "Aanvaarden";
+"alerts.incomingCallButtonAccept" = "Accepteren";
"alerts.incomingCallButtonIgnore" = "Negeren";
//Calls
"calls.callItemTitle" = "Oproep";
"calls.unknown" = "Onbekend";
-"calls.incomingCallInfo" = "wil met je praten";
-"calls.ringing" = "Ringing…";
-"calls.connecting" = "Connecting…";
+"calls.incomingCallInfo" = "wil met u praten";
+"calls.ringing" = "Gaat over…";
+"calls.connecting" = "Bezig met verbinden…";
"calls.callFinished" = "Oproep beëindigd";
//Account Page
@@ -145,56 +145,57 @@
"accountPage.unblockContact" = "Deblokkeren";
"accountPage.proxyAddressAlert" = "Voer proxyadres in";
"accountPage.enableProxy" = "Proxy inschakelen";
-"accountPage.noProxyExplanationLabel" = "Je apparaat zal geen meldingen ontvangen wanneer de proxy uitgeschakeld is";
+"accountPage.noProxyExplanationLabel" = "Uw apparaat zal geen meldingen ontvangen wanneer de proxy uitgeschakeld is";
"accountPage.saveProxyAddress" = "Opslaan";
"accountPage.proxyPaceholder" = "Proxyadres";
"accountPage.enableNotifications" = "Meldingen inschakelen";
"accountPage.proxyDisabledAlertTitle" = "Proxyserver uitgeschakeld";
"accountPage.proxyDisabledAlertBody" = "Schakel de proxy in om meldingen te kunnen ontvangen";
-"accountPage.revokeDeviceTitle" = "Apparaat terugtrekken";
-"accountPage.revokeDeviceMessage" = "Are you sure you want to revoke this device? This action could not be undone.";
-"accountPage.revokeDeviceButton" = "Revoke";
-"accountPage.revokeDevicePlaceholder" = "Enter your passord";
-"accountPage.deviceRevoked" = "Device revocation completed";
-"accountPage.deviceRevocationProgress" = "Revoking...";
-"accountPage.deviceRevocationSuccess" = "Device was revoked";
-"accountPage.deviceRevocationTryAgain" = "Try again";
-"accountPage.deviceRevocationWrongPassword" = "Onjuist wachtwoord";
-"accountPage.deviceRevocationUnknownDevice" = "Unknown device";
-"accountPage.deviceRevocationError" = "Device revocation error";
+"accountPage.revokeDeviceTitle" = "Apparaat intrekken";
+"accountPage.revokeDeviceMessage" = "Weet u zeker dat u dit apparaat wilt intrekken? Deze handeling kan niet ongedaan gemaakt worden.";
+"accountPage.revokeDeviceButton" = "Intrekken";
+"accountPage.revokeDevicePlaceholder" = "Voer uw wachtwoord in";
+"accountPage.deviceRevoked" = "Intrekken van apparaat voltooid";
+"accountPage.deviceRevocationProgress" = "Bezig met intrekken…";
+"accountPage.deviceRevocationSuccess" = "Apparaat is ingetrokken";
+"accountPage.deviceRevocationTryAgain" = "Opnieuw proberen";
+"accountPage.deviceRevocationWrongPassword" = "Verkeerd wachtwoord";
+"accountPage.deviceRevocationUnknownDevice" = "Onbekend apparaat";
+"accountPage.deviceRevocationError" = "Fout bij intrekken van apparaat";
"accountPage.namePlaceholder" = "Naam";
-"accountPage.linkDeviceTitle" = "Link another device";
+"accountPage.linkDeviceTitle" = "Een ander apparaat koppelen";
"accountPage.other" = "Anders";
-"accountPage.removeAccountTitle" = "Remove account";
-"accountPage.removeAccountMessage" = "By clicking \"Remove\" you will remove this account on this device! This action can not be undone. Also, your registered name can be lost.";
+"accountPage.removeAccountTitle" = "Account verwijderen";
+"accountPage.removeAccountMessage" = "Door op ‘Verwijderen’ te klikken, zult u dit account van dit apparaat verwijderen! Deze handeling kan niet ongedaan gemaakt worden. Uw geregistreerde naam zal ook verloren gaan.";
"accountPage.removeAccountButton" = "Verwijderen";
//Account
-"account.sipUsername" = "User Name";
+"account.sipUsername" = "Gebruikersnaam";
"account.sipPassword" = "Wachtwoord";
-"account.sipServer" = "SIP Server";
+"account.sipServer" = "SIP-server";
"account.port" = "Poort";
-"account.createSipAccount" = "Create Sip Account";
-"account.usernameLabel" = "Enter Username";
+"account.proxyServer" = "Proxy";
+"account.createSipAccount" = "SIP-account aanmaken";
+"account.usernameLabel" = "Voer gebruikersnaam in";
"account.passwordLabel" = "Voer wachtwoord in";
-"account.serverLabel" = "Enter Address";
-"account.portLabel" = "Enter Port Number";
-"account.accountStatus" = "Account Status";
-"account.enableAccount" = "Enable Account";
+"account.serverLabel" = "Voer adres in";
+"account.portLabel" = "Voer poortnummer in";
+"account.accountStatus" = "Accountstatus";
+"account.enableAccount" = "Account inschakelen";
"account.statusOnline" = "Online";
"account.statusOffline" = "Offline";
"account.statusConnecting" = "Verbinden";
"account.statusUnknown" = "Onbekend";
-"account.statusConnectionerror" = "Connection Error";
+"account.statusConnectionerror" = "Verbindingsfout";
//Block List Page
-"blockListPage.noBlockedContacts" = "No blocked contacts";
+"blockListPage.noBlockedContacts" = "Geen geblokkeerde contacten";
//Link New Device
"linkDevice.title" = "Een nieuw apparaat koppelen";
-"linkDevice.passwordError" = "Het wachtwoord dat je hebt ingevoerd ontgrendelt deze account niet";
-"linkDevice.networkError" = "Er is een netwerkfout opgetreden tijdens het exporteren";
-"linkDevice.defaultError" = "Er is een fout opgetreden tijdens het exporteren";
-"linkDevice.explanationMessage" = "To complete the process, you need to open Jami on the new device and choose the option \"Link this device to an account.\" Your pin is valid for 10 minutes";
+"linkDevice.passwordError" = "Het wachtwoord dat u heeft ingevoerd ontgrendelt dit account niet";
+"linkDevice.networkError" = "Er trad een netwerkfout op tijdens het exporteren";
+"linkDevice.defaultError" = "Er trad een fout op tijdens het exporteren";
+"linkDevice.explanationMessage" = "Om het proces te voltooien opent u Jami op het nieuwe apparaat en kiest u de optie ‘Dit apparaat aan een account koppelen’. Uw pincode is 10 minuten geldig";
"linkDevice.hudMessage" = "Verifiëren";
//Contact Page
@@ -203,7 +204,7 @@
"contactPage.sendMessage" = "Bericht versturen";
"contactPage.clearConversation" = "Gesprek wissen";
"contactPage.blockContact" = "Contact blokkeren";
-"contactPage.removeConversation" = "Remove Conversation";
+"contactPage.removeConversation" = "Gesprek verwijderen";
//DataTransfer
"dataTransfer.readableStatusCreated" = "Bezig met initialiseren…";
@@ -213,28 +214,32 @@
"dataTransfer.readableStatusOngoing" = "Wordt verstuurd";
"dataTransfer.readableStatusCanceled" = "Geannuleerd";
"dataTransfer.readableStatusSuccess" = "Voltooid";
-"dataTransfer.readableStatusAccept" = "Aanvaarden";
+"dataTransfer.readableStatusAccept" = "Accepteren";
"dataTransfer.readableStatusCancel" = "Annuleren";
//Notifications
-"notifications.incomingCall" = "Incoming Call";
-"notifications.missedCall" = "Missed Call";
-"notifications.acceptCall" = "ACCEPT";
-"notifications.refuseCall" = "REFUSE";
+"notifications.incomingCall" = "Inkomende oproep";
+"notifications.missedCall" = "Gemiste oproep";
+"notifications.acceptCall" = "ACCEPTEREN";
+"notifications.refuseCall" = "AFWIJZEN";
"dataTransfer.readableStatusAwaiting" = "In afwachting…";
"dataTransfer.readableStatusRefuse" = "Afwijzen";
"dataTransfer.readableStatusOngoing" = "Wordt verstuurd";
"dataTransfer.readableStatusCanceled" = "Geannuleerd";
"dataTransfer.readableStatusSuccess" = "Voltooid";
-"dataTransfer.readableStatusAccept" = "Aanvaarden";
+"dataTransfer.readableStatusAccept" = "Accepteren";
"dataTransfer.readableStatusCancel" = "Annuleren";
//Generated Message
"generatedMessage.contactAdded" = "Contact toegevoegd";
"generatedMessage.invitationReceived" = "Uitnodiging ontvangen";
-"generatedMessage.invitationAccepted" = "Uitnodiging aanvaard";
+"generatedMessage.invitationAccepted" = "Uitnodiging geaccepteerd";
"generatedMessage.outgoingCall" = "Uitgaande oproep";
"generatedMessage.incomingCall" = "Inkomende oproep";
"generatedMessage.missedOutgoingCall" = "Gemiste uitgaande oproep";
"generatedMessage.missedIncomingCall" = "Gemiste inkomende oproep";
+//General Settings
+"generalSettings.title" = "Algemene instellingen";
+"generalSettings.videoAcceleration" = "Enable video acceleration";
+
diff --git a/Ring/Ring/Resources/nl_BE.lproj/Localizable.strings b/Ring/Ring/Resources/nl_BE.lproj/Localizable.strings
index 5e83da1..74504f1 100644
--- a/Ring/Ring/Resources/nl_BE.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/nl_BE.lproj/Localizable.strings
@@ -25,8 +25,8 @@
"global.ok" = "Oké";
// Scan
-"scan.badQrCode" = "Slechte QR-code";
-"scan.search" = "Zoeken...";
+"scan.badQrCode" = "Verkeerde QR-code";
+"scan.search" = "Beizg met zoeken…";
// Smartlist
"smartlist.yesterday" = "Gisteren";
@@ -34,104 +34,104 @@
"smartlist.conversations" = "Gesprekken";
"smartlist.searching" = "Zoeken…";
"smartlist.noResults" = "Geen resultaten";
-"smartlist.noConversation" = "No conversations";
-"smartlist.searchBarPlaceholder" = "Enter name...";
+"smartlist.noConversation" = "Geen gesprekken";
+"smartlist.searchBarPlaceholder" = "Geef naam in…";
"smartlist.noNetworkConnectivity" = "Geen netwerkverbinding";
-"smartlist.cellularAccess" = "Zorg dat u toegang tot het mobiel netwerk toegelaten hebt in uw instellingen";
+"smartlist.cellularAccess" = "Zorg dat u toegang tot het mobiele netwerk toegestaan heeft in uw instellingen";
"smartlist.accountsTitle" = "Accounts";
-"smartlist.addAccountButton" = "+ Add Account";
-"smartlist.noNumber" = "Selected contact does not have any number";
-"smartlist.selectOneNumber" = "Select one of the numbers";
+"smartlist.addAccountButton" = "+ Account toevoegen";
+"smartlist.noNumber" = "Het geselecteerde contact heeft geen nummer";
+"smartlist.selectOneNumber" = "Kies één van de nummers";
//Conversation
-"conversation.messagePlaceholder" = "Type your message...";
+"conversation.messagePlaceholder" = "Typ uw bericht…";
//Invitations
-"invitations.noInvitations" = "No invitations";
+"invitations.noInvitations" = "Geen uitnodigingen";
// Walkthrough
//Welcome Screen
-"welcome.title" = "Welcome to Jami !";
-"welcome.text" = "Jami is a free and universal communication platform which preserves the users' privacy and freedoms";
+"welcome.title" = "Welkom bij Jami!";
+"welcome.text" = "Jami is een vrij en universeel communicatieplatform, dat de privacy en vrijheden van zijn gebruikers eerbiedigt";
"welcome.linkDevice" = "Dit apparaat aan een account koppelen";
-"welcome.createAccount" = "Create a Jami account";
+"welcome.createAccount" = "Een Jami-account aanmaken";
//Creation Profile Screen
"createProfile.skipCreateProfile" = "Overslaan";
"createProfile.profileCreated" = "Volgende";
-"createProfile.title" = "Personalise your profile";
-"createProfile.enterNameLabel" = "Enter a display name";
-"createProfile.enterNamePlaceholder" = "Voer naam in";
-"createProfile.subtitle" = "Your profile will be shared with your contacts. You can change it at any time.";
-"createProfile.createYourAvatar" = "Create your avatar";
+"createProfile.title" = "Personaliseer uw profiel";
+"createProfile.enterNameLabel" = "Geef een weergavenaam in";
+"createProfile.enterNamePlaceholder" = "Geef naam in";
+"createProfile.subtitle" = "Uw profiel wordt gedeeld met uw contacten. U kunt het op elk moment wijzigen.";
+"createProfile.createYourAvatar" = "Maak uw avatar aan";
//Create Account form
"createAccount.createAccountFormTitle" = "Maak uw account aan";
-"createAccount.chooseStrongPassword" = "Choose strong password you will remember to protect your Jami account.";
+"createAccount.chooseStrongPassword" = "Kies een sterk wachtwoord om uw Jami-account te beschermen.";
"createAccount.enterNewUsernamePlaceholder" = "Gebruikersnaam";
-"createAccount.newPasswordPlaceholder" = "Paswoord";
-"createAccount.repeatPasswordPlaceholder" = "Bevestigd paswoord";
+"createAccount.newPasswordPlaceholder" = "Wachtwoord";
+"createAccount.repeatPasswordPlaceholder" = "Bevestig wachtwoord";
"createAccount.passwordCharactersNumberError" = "Minimaal 6 tekens";
-"createAccount.passwordNotMatchingError" = "paswoorden komen niet overeen";
-"createAccount.lookingForUsernameAvailability" = "looking for availability…";
+"createAccount.passwordNotMatchingError" = "wachtwoorden komen niet overeen";
+"createAccount.lookingForUsernameAvailability" = "beschikbaarheid wordt gecontroleerd…";
"createAccount.invalidUsername" = "ongeldige gebruikersnaam";
"createAccount.usernameAlreadyTaken" = "gebruikersnaam reeds in gebruik";
"createAccount.loading" = "Laden";
"createAccount.waitCreateAccountTitle" = "Account wordt toegevoegd";
-"createAccount.RegisterAUsername" = "Register a username";
-"createAccount.ChooseAPassword" = "Encrypt my account";
-"createAccount.PasswordInformation" = "Choose a password to encrypt your local account. Don’t forget it or you will not be able to recover your account";
-"createAccount.EnableNotifications" = "Notifications";
-"createAccount.Recommended" = "(Recommended)";
+"createAccount.RegisterAUsername" = "Een gebruikersnaam registreren";
+"createAccount.ChooseAPassword" = "Mijn account versleutelen";
+"createAccount.PasswordInformation" = "Kies een wachtwoord om uw lokale account mee te versleutelen. Vergeet het niet, u zult uw account anders niet kunnen herstellen";
+"createAccount.EnableNotifications" = "Meldingen";
+"createAccount.Recommended" = "(Aanbevolen)";
//Link To Account form
"linkToAccount.waitLinkToAccountTitle" = "Account koppelen";
"linkToAccount.linkButtonTitle" = "Apparaat koppelen";
-"linkToAccount.passwordPlaceholder" = "Paswoord";
+"linkToAccount.passwordPlaceholder" = "Wachtwoord";
"linkToAccount.pinPlaceholder" = "Pincode";
-"linkToAccount.passwordLabel" = "Voer uw paswoord in";
-"linkToAccount.pinLabel" = "Voer uw pincode in";
-"linkToAccount.explanationPinMessage" = "Ga naar de accountbeheerinstellingen op het apparaat dat het account bevat die u wil gebruiken voor de pincode te genereren. Selecteer ‘Een ander apparaat aan dit account koppelen’. U gaat de pincode krijgen die u nodig hebt voor dit proces te voltooien. De pincode is slechts 10 minuten geldig.";
+"linkToAccount.passwordLabel" = "Geef wachtwoord in";
+"linkToAccount.pinLabel" = "Geef pincode in";
+"linkToAccount.explanationPinMessage" = "Ga naar de accountbeheerinstellingen op het apparaat dat de account bevat die u wilt gebruiken om de pincode te genereren. Selecteer ‘Een ander apparaat aan deze account koppelen’. U zult de pincode krijgen die u nodig heeft om dit proces te voltooien. De pincode is slechts 10 minuten geldig.";
//Alerts
-"alerts.accountCannotBeFoundTitle" = "Account kan niet worden gevonden";
-"alerts.accountCannotBeFoundMessage" = "Account couldn't be found on the Jami network. Make sure it was exported on Jami from an existing device, and that provided credentials are correct.";
+"alerts.accountCannotBeFoundTitle" = "Account kan niet gevonden worden";
+"alerts.accountCannotBeFoundMessage" = "Account kon niet gevonden worden op het Jami-netwerk. Controleer of de account geëxporteerd is van een bestaand apparaat en dat de ingevoerde gebruikersreferenties correct zijn.";
"alerts.accountAddedTitle" = "Account toegevoegd";
"alerts.accountNoNetworkTitle" = "Kan geen verbinding maken met het netwerk";
-"alerts.accountNoNetworkMessage" = "Could not add account because Jami couldn't connect to the distributed network. Check your device connectivity.";
+"alerts.accountNoNetworkMessage" = "Kon de account niet toevoegen omdat Jami geen verbinding kon maken met het gedistribueerd netwerk. Controleer de netwerkverbinding van uw apparaat.";
"alerts.accountDefaultErrorTitle" = "Onbekende fout";
-"alerts.accountDefaultErrorMessage" = "Het account kon niet aangemaakt worden";
+"alerts.accountDefaultErrorMessage" = "De account kon niet aangemaakt worden.";
"alerts.profileTakePhoto" = "Foto trekken";
"alerts.profileUploadPhoto" = "Foto uploaden";
"alerts.profileCancelPhoto" = "Annuleren";
"alerts.accountLinkedTitle" = "Account koppelen";
-"alerts.dbFailedTitle" = "An error happned when launching Jami";
-"alerts.dbFailedMessage" = "Sluit de app en probeer het opnieuw";
-"alerts.confirmBlockContact" = "Bent u zeker dat u dit contact wilt blokkeren? De gespreksgeschiedenis met dit contact zal ook voorgoed verwijderd worden.";
+"alerts.dbFailedTitle" = "Er is een fout opgetreden bij het starten van Jami";
+"alerts.dbFailedMessage" = "Sluit de app en herprobeer het";
+"alerts.confirmBlockContact" = "Weet u zeker dat u dit contact wilt blokkeren? De gespreksgeschiedenis met dit contact zal ook voorgoed verwijderd worden.";
"alerts.confirmBlockContactTitle" = "Contact blokkeren";
-"alerts.confirmDeleteConversation" = "Bent u zeker dat u dit gesprek voorgoed wil verwijderen?";
-"alerts.confirmDeleteConversationFromContact" = "Bent u zeker dat u het gesprek met dit contact voorgoed wil verwijderen?";
+"alerts.confirmDeleteConversation" = "Weet u zeker dat u dit gesprek voorgoed wilt verwijderen?";
+"alerts.confirmDeleteConversationFromContact" = "Weet u zeker dat u het gesprek met dit contact wilt verwijderen?";
"alerts.confirmDeleteConversationTitle" = "Gesprek verwijderen";
-"alerts.confirmClearConversation" = "Are you sure you want to clear the conversation with this contact?";
-"alerts.confirmClearConversationTitle" = "Clear Conversation";
+"alerts.confirmClearConversation" = "Weet u zeker dat u het gesprek met dit contact wilt verwijderen?";
+"alerts.confirmClearConversationTitle" = "Gesprek wissen";
//Actions
"actions.blockAction" = "Blokkeren";
"actions.deleteAction" = "Verwijderen";
"actions.cancelAction" = "Annuleren";
-"actions.clearAction" = "Clear";
+"actions.clearAction" = "Wissen";
"actions.backAction" = "Terug";
-"alerts.incomingCallAllertTitle" = "Inkomenden oproep van";
+"alerts.incomingCallAllertTitle" = "Inkomende oproep van";
"alerts.incomingCallButtonAccept" = "Aanvaarden";
"alerts.incomingCallButtonIgnore" = "Negeren";
//Calls
-"calls.callItemTitle" = "Bellen";
+"calls.callItemTitle" = "Oproep";
"calls.unknown" = "Onbekend";
-"calls.incomingCallInfo" = "wilt met u spreken";
-"calls.ringing" = "Ringing…";
-"calls.connecting" = "Aan het verbinden...";
+"calls.incomingCallInfo" = "wilt met u praten";
+"calls.ringing" = "Gaat over…";
+"calls.connecting" = "Bezig met verbinden…";
"calls.callFinished" = "Oproep beëindigd";
//Account Page
@@ -139,71 +139,72 @@
"accountPage.settingsHeader" = "Instellingen";
"accountPage.username" = "gebruikersnaam:";
"accountPage.usernameNotRegistered" = "gebruikersnaam: niet geregistreerd";
-"accountPage.credentialsHeader" = "Accountdetails";
+"accountPage.credentialsHeader" = "Accountgegevens";
"accountPage.enableProxy" = "Proxy inschakelen";
"accountPage.blockedContacts" = "Blokkeringslijst";
-"accountPage.unblockContact" = "DEBLOKKEREN";
-"accountPage.proxyAddressAlert" = "Voer een proxyadres in";
+"accountPage.unblockContact" = "Deblokkeren";
+"accountPage.proxyAddressAlert" = "Geef proxyadres in";
"accountPage.enableProxy" = "Proxy inschakelen";
-"accountPage.noProxyExplanationLabel" = "Uw apparaat gaat geen meldingen ontvangen wanneer dat de proxy is uitgeschakeld";
+"accountPage.noProxyExplanationLabel" = "Uw apparaat zal geen meldingen ontvangen wanneer de proxy uitgeschakeld is";
"accountPage.saveProxyAddress" = "Opslaan";
"accountPage.proxyPaceholder" = "Proxyadres";
"accountPage.enableNotifications" = "Meldingen inschakelen";
"accountPage.proxyDisabledAlertTitle" = "Proxyserver uitgeschakeld";
-"accountPage.proxyDisabledAlertBody" = "Schakel de proxy in voor meldingen te kunnen ontvangen";
-"accountPage.revokeDeviceTitle" = "Apparaat terugtrekken";
-"accountPage.revokeDeviceMessage" = "Are you sure you want to revoke this device? This action could not be undone.";
-"accountPage.revokeDeviceButton" = "Revoke";
-"accountPage.revokeDevicePlaceholder" = "Enter your passord";
-"accountPage.deviceRevoked" = "Device revocation completed";
-"accountPage.deviceRevocationProgress" = "Revoking...";
-"accountPage.deviceRevocationSuccess" = "Device was revoked";
-"accountPage.deviceRevocationTryAgain" = "Try again";
-"accountPage.deviceRevocationWrongPassword" = "Onjuist paswoord";
-"accountPage.deviceRevocationUnknownDevice" = "Unknown device";
-"accountPage.deviceRevocationError" = "Device revocation error";
+"accountPage.proxyDisabledAlertBody" = "Schakel de proxy in om meldingen te kunnen ontvangen";
+"accountPage.revokeDeviceTitle" = "Apparaat intrekken";
+"accountPage.revokeDeviceMessage" = "Weet u zeker dat u dit apparaat wilt intrekken? Deze handeling kan niet ongedaan gemaakt worden.";
+"accountPage.revokeDeviceButton" = "Intrekken";
+"accountPage.revokeDevicePlaceholder" = "Geef uw wachtwoord in";
+"accountPage.deviceRevoked" = "Intrekken van apparaat voltooid";
+"accountPage.deviceRevocationProgress" = "Bezig met intrekken…";
+"accountPage.deviceRevocationSuccess" = "Apparaat is ingetrokken";
+"accountPage.deviceRevocationTryAgain" = "Herproberen";
+"accountPage.deviceRevocationWrongPassword" = "Verkeerd wachtwoord";
+"accountPage.deviceRevocationUnknownDevice" = "Onbekend apparaat";
+"accountPage.deviceRevocationError" = "Fout bij intrekken van apparaat";
"accountPage.namePlaceholder" = "Naam";
-"accountPage.linkDeviceTitle" = "Apparaat koppelen";
+"accountPage.linkDeviceTitle" = "Een ander apparaat koppelen";
"accountPage.other" = "Anders";
-"accountPage.removeAccountTitle" = "Remove account";
-"accountPage.removeAccountMessage" = "By clicking \"Remove\" you will remove this account on this device! This action can not be undone. Also, your registered name can be lost.";
+"accountPage.removeAccountTitle" = "Account verwijderen";
+"accountPage.removeAccountMessage" = "Door op ‘Verwijderen’ te klikken, zult u deze account van dit apparaat verwijderen! Deze handeling kan niet ongedaan gemaakt worden. Uw geregistreerde naam zal ook verloren gaan.";
"accountPage.removeAccountButton" = "Verwijderen";
//Account
-"account.sipUsername" = "User Name";
-"account.sipPassword" = "Paswoord";
-"account.sipServer" = "SIP Server";
+"account.sipUsername" = "Gebruikersnaam";
+"account.sipPassword" = "Wachtwoord";
+"account.sipServer" = "SIP-server";
"account.port" = "Poort";
-"account.createSipAccount" = "Create Sip Account";
-"account.usernameLabel" = "Enter Username";
-"account.passwordLabel" = "Voer uw paswoord in";
-"account.serverLabel" = "Enter Address";
-"account.portLabel" = "Enter Port Number";
-"account.accountStatus" = "Account Status";
-"account.enableAccount" = "Enable Account";
+"account.proxyServer" = "Proxy";
+"account.createSipAccount" = "SIP-account aanmaken";
+"account.usernameLabel" = "Geef gebruikersnaam in";
+"account.passwordLabel" = "Geef wachtwoord in";
+"account.serverLabel" = "Geef adres in";
+"account.portLabel" = "Geef poortnummer in";
+"account.accountStatus" = "Accountstatus";
+"account.enableAccount" = "Account inschakelen";
"account.statusOnline" = "Online";
"account.statusOffline" = "Offline";
"account.statusConnecting" = "Verbinden";
"account.statusUnknown" = "Onbekend";
-"account.statusConnectionerror" = "Connection Error";
+"account.statusConnectionerror" = "Verbindingsfout";
//Block List Page
-"blockListPage.noBlockedContacts" = "No blocked contacts";
+"blockListPage.noBlockedContacts" = "Geen geblokkeerde contacten";
//Link New Device
"linkDevice.title" = "Een nieuw apparaat koppelen";
-"linkDevice.passwordError" = "Het paswoord dat u hebt ingevoerd ontgrendelt dit account niet";
+"linkDevice.passwordError" = "Het wachtwoord dat u heeft ingegeven ontgrendelt deze account niet";
"linkDevice.networkError" = "Er is een netwerkfout opgetreden tijdens het exporteren";
"linkDevice.defaultError" = "Er is een fout opgetreden tijdens het exporteren";
-"linkDevice.explanationMessage" = "To complete the process, you need to open Jami on the new device and choose the option \"Link this device to an account.\" Your pin is valid for 10 minutes";
+"linkDevice.explanationMessage" = "Om het proces te voltooien opent u Jami op het nieuwe apparaat en kiest u de optie ‘Dit apparaat aan een account koppelen’. Uw pincode is 10 minuten geldig";
"linkDevice.hudMessage" = "Verifiëren";
//Contact Page
"contactPage.startAudioCall" = "Audio-oproep starten";
"contactPage.startVideoCall" = "Video-oproep starten";
"contactPage.sendMessage" = "Bericht versturen";
-"contactPage.clearConversation" = "Babbel wissen";
+"contactPage.clearConversation" = "Gesprek wissen";
"contactPage.blockContact" = "Contact blokkeren";
-"contactPage.removeConversation" = "Remove Conversation";
+"contactPage.removeConversation" = "Gesprek verwijderen";
//DataTransfer
"dataTransfer.readableStatusCreated" = "Bezig met initialiseren…";
@@ -217,10 +218,10 @@
"dataTransfer.readableStatusCancel" = "Annuleren";
//Notifications
-"notifications.incomingCall" = "Incoming Call";
-"notifications.missedCall" = "Missed Call";
-"notifications.acceptCall" = "ACCEPT";
-"notifications.refuseCall" = "REFUSE";
+"notifications.incomingCall" = "Inkomende oproep";
+"notifications.missedCall" = "Gemiste oproep";
+"notifications.acceptCall" = "AANVAARDEN";
+"notifications.refuseCall" = "AFWIJZEN";
"dataTransfer.readableStatusAwaiting" = "In afwachting…";
"dataTransfer.readableStatusRefuse" = "Afwijzen";
"dataTransfer.readableStatusOngoing" = "Wordt verstuurd";
@@ -238,3 +239,7 @@
"generatedMessage.missedOutgoingCall" = "Gemiste uitgaande oproep";
"generatedMessage.missedIncomingCall" = "Gemiste inkomende oproep";
+//General Settings
+"generalSettings.title" = "Algemene instellingen";
+"generalSettings.videoAcceleration" = "Enable video acceleration";
+
diff --git a/Ring/Ring/Resources/pa.lproj/Localizable.strings b/Ring/Ring/Resources/pa.lproj/Localizable.strings
index 3e54d33..9020394 100644
--- a/Ring/Ring/Resources/pa.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/pa.lproj/Localizable.strings
@@ -173,6 +173,7 @@
"account.sipPassword" = "Password";
"account.sipServer" = "SIP Server";
"account.port" = "Port";
+"account.proxyServer" = "Proxy";
"account.createSipAccount" = "Create Sip Account";
"account.usernameLabel" = "Enter Username";
"account.passwordLabel" = "Enter Password";
@@ -238,3 +239,7 @@
"generatedMessage.missedOutgoingCall" = "Missed outgoing call";
"generatedMessage.missedIncomingCall" = "Missed incoming call";
+//General Settings
+"generalSettings.title" = "General settings";
+"generalSettings.videoAcceleration" = "Enable video acceleration";
+
diff --git a/Ring/Ring/Resources/pl.lproj/Localizable.strings b/Ring/Ring/Resources/pl.lproj/Localizable.strings
index 42f22b5..2280c95 100644
--- a/Ring/Ring/Resources/pl.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/pl.lproj/Localizable.strings
@@ -173,6 +173,7 @@
"account.sipPassword" = "Hasło";
"account.sipServer" = "SIP Server";
"account.port" = "Port";
+"account.proxyServer" = "Pełnomocnik";
"account.createSipAccount" = "Create Sip Account";
"account.usernameLabel" = "Enter Username";
"account.passwordLabel" = "Wpisz hasło";
@@ -238,3 +239,7 @@
"generatedMessage.missedOutgoingCall" = "Nieodebrane połączenie wychodzące";
"generatedMessage.missedIncomingCall" = "Nieodebrane połączenie przychodzące";
+//General Settings
+"generalSettings.title" = "Ogólne ustawienia";
+"generalSettings.videoAcceleration" = "Enable video acceleration";
+
diff --git a/Ring/Ring/Resources/pl_PL.lproj/Localizable.strings b/Ring/Ring/Resources/pl_PL.lproj/Localizable.strings
index ac4e0e8..29dfe93 100644
--- a/Ring/Ring/Resources/pl_PL.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/pl_PL.lproj/Localizable.strings
@@ -173,6 +173,7 @@
"account.sipPassword" = "Hasło";
"account.sipServer" = "SIP Server";
"account.port" = "Port";
+"account.proxyServer" = "Pełnomocnik";
"account.createSipAccount" = "Create Sip Account";
"account.usernameLabel" = "Enter Username";
"account.passwordLabel" = "Wpisz hasło";
@@ -238,3 +239,7 @@
"generatedMessage.missedOutgoingCall" = "Nieodebrane połączenie wychodzące";
"generatedMessage.missedIncomingCall" = "Nieodebrane połączenie przychodzące";
+//General Settings
+"generalSettings.title" = "Ogólne ustawienia";
+"generalSettings.videoAcceleration" = "Enable video acceleration";
+
diff --git a/Ring/Ring/Resources/pt-BR.lproj/Localizable.strings b/Ring/Ring/Resources/pt-BR.lproj/Localizable.strings
index edc3579..ef057cb 100644
--- a/Ring/Ring/Resources/pt-BR.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/pt-BR.lproj/Localizable.strings
@@ -173,6 +173,7 @@
"account.sipPassword" = "Senha";
"account.sipServer" = "Servidor SIP";
"account.port" = "Porta";
+"account.proxyServer" = "Proxy";
"account.createSipAccount" = "Create Sip Account";
"account.usernameLabel" = "Enter Username";
"account.passwordLabel" = "Digite a Senha";
@@ -238,3 +239,7 @@
"generatedMessage.missedOutgoingCall" = "Chamadas efetuadas perdidas";
"generatedMessage.missedIncomingCall" = "Chamadas recebidas perdidas";
+//General Settings
+"generalSettings.title" = "Configurações gerais";
+"generalSettings.videoAcceleration" = "Enable video acceleration";
+
diff --git a/Ring/Ring/Resources/pt.lproj/Localizable.strings b/Ring/Ring/Resources/pt.lproj/Localizable.strings
index b96c950..56d471f 100644
--- a/Ring/Ring/Resources/pt.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/pt.lproj/Localizable.strings
@@ -39,9 +39,9 @@
"smartlist.noNetworkConnectivity" = "Sem conectividade à rede";
"smartlist.cellularAccess" = "Verifique se o acesso via telemóvel está autorizado nas suas configurações";
"smartlist.accountsTitle" = "Contas";
-"smartlist.addAccountButton" = "+ Add Account";
-"smartlist.noNumber" = "Selected contact does not have any number";
-"smartlist.selectOneNumber" = "Select one of the numbers";
+"smartlist.addAccountButton" = "+ Adicionar conta";
+"smartlist.noNumber" = "O contacto selecionado não tem um número";
+"smartlist.selectOneNumber" = "Selecione um dos números";
//Conversation
"conversation.messagePlaceholder" = "Escreva a sua mensagem...";
@@ -166,25 +166,26 @@
"accountPage.linkDeviceTitle" = "Ligar outro dispositivo";
"accountPage.other" = "Outro";
"accountPage.removeAccountTitle" = "Remover conta";
-"accountPage.removeAccountMessage" = "By clicking \"Remove\" you will remove this account on this device! This action can not be undone. Also, your registered name can be lost.";
+"accountPage.removeAccountMessage" = "Ao clicar em \"Remover\" irá remover esta conta neste dispositivo! Esta ação não pode ser desfeita. O seu nome de utilizador também será perdido.";
"accountPage.removeAccountButton" = "Remover";
//Account
"account.sipUsername" = "Nome do utilizador";
"account.sipPassword" = "Palavra-chave";
"account.sipServer" = "Servidor SIP";
"account.port" = "Porta";
-"account.createSipAccount" = "Create Sip Account";
-"account.usernameLabel" = "Enter Username";
+"account.proxyServer" = "Proxy";
+"account.createSipAccount" = "Criar conta SIP";
+"account.usernameLabel" = "Introduzir nome de utilizador";
"account.passwordLabel" = "Introduzir Palavra-chave";
-"account.serverLabel" = "Enter Address";
-"account.portLabel" = "Enter Port Number";
-"account.accountStatus" = "Account Status";
-"account.enableAccount" = "Enable Account";
+"account.serverLabel" = "Introduzir endereço";
+"account.portLabel" = "Introduzir número da porta";
+"account.accountStatus" = "Estado da conta";
+"account.enableAccount" = "Ativar conta";
"account.statusOnline" = "Ligado";
"account.statusOffline" = "Desligado";
"account.statusConnecting" = "A conectar";
"account.statusUnknown" = "Desconhecido";
-"account.statusConnectionerror" = "Connection Error";
+"account.statusConnectionerror" = "Erro de conexão";
//Block List Page
"blockListPage.noBlockedContacts" = "Sem contactos bloqueados";
@@ -238,3 +239,7 @@
"generatedMessage.missedOutgoingCall" = "Chamadas efetuadas perdidas";
"generatedMessage.missedIncomingCall" = "Chamadas recebidas perdidas";
+//General Settings
+"generalSettings.title" = "Configurações gerias";
+"generalSettings.videoAcceleration" = "Enable video acceleration";
+
diff --git a/Ring/Ring/Resources/pt_PT.lproj/Localizable.strings b/Ring/Ring/Resources/pt_PT.lproj/Localizable.strings
index 5caa278..324c0db 100644
--- a/Ring/Ring/Resources/pt_PT.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/pt_PT.lproj/Localizable.strings
@@ -38,10 +38,10 @@
"smartlist.searchBarPlaceholder" = "Introduza o nome...";
"smartlist.noNetworkConnectivity" = "Sem conectividade à rede";
"smartlist.cellularAccess" = "Verifique se o acesso via telemóvel está autorizado nas suas configurações";
-"smartlist.accountsTitle" = "Accounts";
-"smartlist.addAccountButton" = "+ Add Account";
-"smartlist.noNumber" = "Selected contact does not have any number";
-"smartlist.selectOneNumber" = "Select one of the numbers";
+"smartlist.accountsTitle" = "Contas";
+"smartlist.addAccountButton" = "+ Adicionar conta";
+"smartlist.noNumber" = "O contacto selecionado não tem um número";
+"smartlist.selectOneNumber" = "Selecione um dos números";
//Conversation
"conversation.messagePlaceholder" = "Escreva a sua mensagem...";
@@ -121,7 +121,7 @@
"actions.deleteAction" = "Eliminar";
"actions.cancelAction" = "Cancelar";
"actions.clearAction" = "Limpar";
-"actions.backAction" = "Back";
+"actions.backAction" = "Voltar";
"alerts.incomingCallAllertTitle" = "A receber chamada de";
"alerts.incomingCallButtonAccept" = "Aceitar";
"alerts.incomingCallButtonIgnore" = "Ignorar";
@@ -164,27 +164,28 @@
"accountPage.deviceRevocationError" = "Erro ao desvincular o dispositivo";
"accountPage.namePlaceholder" = "Nome";
"accountPage.linkDeviceTitle" = "Associar outro dispositivo";
-"accountPage.other" = "Other";
-"accountPage.removeAccountTitle" = "Remove account";
-"accountPage.removeAccountMessage" = "By clicking \"Remove\" you will remove this account on this device! This action can not be undone. Also, your registered name can be lost.";
-"accountPage.removeAccountButton" = "Remove";
+"accountPage.other" = "Outro";
+"accountPage.removeAccountTitle" = "Remover conta";
+"accountPage.removeAccountMessage" = "Ao clicar em \"Remover\" irá remover esta conta neste dispositivo! Esta ação não pode ser desfeita. O seu nome de utilizador também será perdido.";
+"accountPage.removeAccountButton" = "Remover";
//Account
-"account.sipUsername" = "User Name";
-"account.sipPassword" = "Password";
-"account.sipServer" = "SIP Server";
-"account.port" = "Port";
-"account.createSipAccount" = "Create Sip Account";
-"account.usernameLabel" = "Enter Username";
-"account.passwordLabel" = "Enter Password";
-"account.serverLabel" = "Enter Address";
-"account.portLabel" = "Enter Port Number";
-"account.accountStatus" = "Account Status";
-"account.enableAccount" = "Enable Account";
-"account.statusOnline" = "Online";
-"account.statusOffline" = "Offline";
-"account.statusConnecting" = "Connecting";
-"account.statusUnknown" = "Unknown";
-"account.statusConnectionerror" = "Connection Error";
+"account.sipUsername" = "Nome do utilizador";
+"account.sipPassword" = "Palavra-chave";
+"account.sipServer" = "Servidor SIP";
+"account.port" = "Porta";
+"account.proxyServer" = "Proxy";
+"account.createSipAccount" = "Criar conta SIP";
+"account.usernameLabel" = "Introduzir nome de utilizador";
+"account.passwordLabel" = "Introduzir Palavra-Chave";
+"account.serverLabel" = "Introduzir endereço";
+"account.portLabel" = "Introduzir número da porta";
+"account.accountStatus" = "Estado da conta";
+"account.enableAccount" = "Ativar conta";
+"account.statusOnline" = "Ligado";
+"account.statusOffline" = "Desligado";
+"account.statusConnecting" = "A conectar";
+"account.statusUnknown" = "Desconhecido";
+"account.statusConnectionerror" = "Erro de conexão";
//Block List Page
"blockListPage.noBlockedContacts" = "Sem contactos bloqueados";
@@ -238,3 +239,7 @@
"generatedMessage.missedOutgoingCall" = "Chamadas efetuadas perdidas";
"generatedMessage.missedIncomingCall" = "Chamadas recebidas perdidas";
+//General Settings
+"generalSettings.title" = "Configurações gerais";
+"generalSettings.videoAcceleration" = "Enable video acceleration";
+
diff --git a/Ring/Ring/Resources/ro.lproj/Localizable.strings b/Ring/Ring/Resources/ro.lproj/Localizable.strings
index 5cc9d93..2d8b5da 100644
--- a/Ring/Ring/Resources/ro.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ro.lproj/Localizable.strings
@@ -173,6 +173,7 @@
"account.sipPassword" = "Parola";
"account.sipServer" = "SIP Server";
"account.port" = "Port";
+"account.proxyServer" = "Proxy";
"account.createSipAccount" = "Create Sip Account";
"account.usernameLabel" = "Enter Username";
"account.passwordLabel" = "Enter Password";
@@ -238,3 +239,7 @@
"generatedMessage.missedOutgoingCall" = "Missed outgoing call";
"generatedMessage.missedIncomingCall" = "Apel pierdut";
+//General Settings
+"generalSettings.title" = "General settings";
+"generalSettings.videoAcceleration" = "Enable video acceleration";
+
diff --git a/Ring/Ring/Resources/ru-RU.lproj/Localizable.strings b/Ring/Ring/Resources/ru-RU.lproj/Localizable.strings
index 1eb087c..47357d3 100644
--- a/Ring/Ring/Resources/ru-RU.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ru-RU.lproj/Localizable.strings
@@ -173,6 +173,7 @@
"account.sipPassword" = "Пароль";
"account.sipServer" = "SIP Server";
"account.port" = "Порт";
+"account.proxyServer" = "Прокси";
"account.createSipAccount" = "Create Sip Account";
"account.usernameLabel" = "Enter Username";
"account.passwordLabel" = "Enter Password";
@@ -238,3 +239,7 @@
"generatedMessage.missedOutgoingCall" = "Missed outgoing call";
"generatedMessage.missedIncomingCall" = "Missed incoming call";
+//General Settings
+"generalSettings.title" = "General settings";
+"generalSettings.videoAcceleration" = "Enable video acceleration";
+
diff --git a/Ring/Ring/Resources/ru.lproj/Localizable.strings b/Ring/Ring/Resources/ru.lproj/Localizable.strings
index 2c030c4..bc6b212 100644
--- a/Ring/Ring/Resources/ru.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/ru.lproj/Localizable.strings
@@ -173,6 +173,7 @@
"account.sipPassword" = "Пароль";
"account.sipServer" = "Сервер SIP";
"account.port" = "Порт";
+"account.proxyServer" = "Прокси";
"account.createSipAccount" = "Create Sip Account";
"account.usernameLabel" = "Enter Username";
"account.passwordLabel" = "Введите пароль";
@@ -238,3 +239,7 @@
"generatedMessage.missedOutgoingCall" = "Непринятый исходящий вызов";
"generatedMessage.missedIncomingCall" = "Пропущенный входящий вызов";
+//General Settings
+"generalSettings.title" = "Основные настройки";
+"generalSettings.videoAcceleration" = "Enable video acceleration";
+
diff --git a/Ring/Ring/Resources/sk-SK.lproj/Localizable.strings b/Ring/Ring/Resources/sk-SK.lproj/Localizable.strings
index 6df1e77..a67cf21 100644
--- a/Ring/Ring/Resources/sk-SK.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/sk-SK.lproj/Localizable.strings
@@ -173,6 +173,7 @@
"account.sipPassword" = "Password";
"account.sipServer" = "SIP Server";
"account.port" = "Port";
+"account.proxyServer" = "Proxy";
"account.createSipAccount" = "Create Sip Account";
"account.usernameLabel" = "Enter Username";
"account.passwordLabel" = "Enter Password";
@@ -238,3 +239,7 @@
"generatedMessage.missedOutgoingCall" = "Missed outgoing call";
"generatedMessage.missedIncomingCall" = "Missed incoming call";
+//General Settings
+"generalSettings.title" = "General settings";
+"generalSettings.videoAcceleration" = "Enable video acceleration";
+
diff --git a/Ring/Ring/Resources/sl.lproj/Localizable.strings b/Ring/Ring/Resources/sl.lproj/Localizable.strings
index 7edad62..961b3cf 100644
--- a/Ring/Ring/Resources/sl.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/sl.lproj/Localizable.strings
@@ -173,6 +173,7 @@
"account.sipPassword" = "Geslo";
"account.sipServer" = "SIP Server";
"account.port" = "Vrata";
+"account.proxyServer" = "Proxy";
"account.createSipAccount" = "Create Sip Account";
"account.usernameLabel" = "Enter Username";
"account.passwordLabel" = "Enter Password";
@@ -238,3 +239,7 @@
"generatedMessage.missedOutgoingCall" = "Zgrešen odhodni klic";
"generatedMessage.missedIncomingCall" = "Zgrešen dohodni klic";
+//General Settings
+"generalSettings.title" = "General settings";
+"generalSettings.videoAcceleration" = "Enable video acceleration";
+
diff --git a/Ring/Ring/Resources/sq-AL.lproj/Localizable.strings b/Ring/Ring/Resources/sq-AL.lproj/Localizable.strings
index 6e32c9d..62d88ee 100644
--- a/Ring/Ring/Resources/sq-AL.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/sq-AL.lproj/Localizable.strings
@@ -39,9 +39,9 @@
"smartlist.noNetworkConnectivity" = "Pa lidhje në rrjet";
"smartlist.cellularAccess" = "Sigurohuni qe te rregullimet tuaja i është dhënë hyrje te celulari";
"smartlist.accountsTitle" = "Llogari";
-"smartlist.addAccountButton" = "+ Add Account";
-"smartlist.noNumber" = "Selected contact does not have any number";
-"smartlist.selectOneNumber" = "Select one of the numbers";
+"smartlist.addAccountButton" = "+ Shtoni Llogari";
+"smartlist.noNumber" = "Kontakti i përzgjedhur s’ka ndonjë numër";
+"smartlist.selectOneNumber" = "Përzgjidhni një nga numrat";
//Conversation
"conversation.messagePlaceholder" = "Shkruani mesazhin tuaj…";
@@ -166,25 +166,26 @@
"accountPage.linkDeviceTitle" = "Lidhni një pajisje tjetër";
"accountPage.other" = "Tjetër";
"accountPage.removeAccountTitle" = "Hiqe llogarinë";
-"accountPage.removeAccountMessage" = "By clicking \"Remove\" you will remove this account on this device! This action can not be undone. Also, your registered name can be lost.";
+"accountPage.removeAccountMessage" = "Duke klikuar \"Hiqe\", do ta hiqni këtë llogari nga kjo pajisje! Ky veprim s’mund të zhbëhet. Po ashtu, emri juaj i regjistruar mund të humbë.";
"accountPage.removeAccountButton" = "Hiqe";
//Account
"account.sipUsername" = "Emër Përdoruesi";
"account.sipPassword" = "Fjalëkalim";
"account.sipServer" = "Shërbyes SIP";
"account.port" = "Portë";
-"account.createSipAccount" = "Create Sip Account";
-"account.usernameLabel" = "Enter Username";
+"account.proxyServer" = "Ndërmjetës";
+"account.createSipAccount" = "Krijoni Llogari Sip";
+"account.usernameLabel" = "Jepni Emër Përdoruesi";
"account.passwordLabel" = "Jepni Fjalëkalimin";
-"account.serverLabel" = "Enter Address";
-"account.portLabel" = "Enter Port Number";
-"account.accountStatus" = "Account Status";
-"account.enableAccount" = "Enable Account";
+"account.serverLabel" = "Jepni Adresë";
+"account.portLabel" = "Jepni Numër Porte";
+"account.accountStatus" = "Gjendje Llogarie";
+"account.enableAccount" = "Akitvizo Llogari";
"account.statusOnline" = "Në linjë";
"account.statusOffline" = "Jo në linjë";
"account.statusConnecting" = "Po lidhet";
"account.statusUnknown" = "I panjohur";
-"account.statusConnectionerror" = "Connection Error";
+"account.statusConnectionerror" = "Gabim Lidhjeje";
//Block List Page
"blockListPage.noBlockedContacts" = "S’ka kontakte të bllokuar";
@@ -238,3 +239,7 @@
"generatedMessage.missedOutgoingCall" = "Thirrje ikse të humbura";
"generatedMessage.missedIncomingCall" = "Thirrje ardhëse të humbura";
+//General Settings
+"generalSettings.title" = "Rregullime të përgjithshme";
+"generalSettings.videoAcceleration" = "Enable video acceleration";
+
diff --git a/Ring/Ring/Resources/sv.lproj/Localizable.strings b/Ring/Ring/Resources/sv.lproj/Localizable.strings
index f171797..b73e191 100644
--- a/Ring/Ring/Resources/sv.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/sv.lproj/Localizable.strings
@@ -39,9 +39,9 @@
"smartlist.noNetworkConnectivity" = "Ingen nätverksanslutning";
"smartlist.cellularAccess" = "Tillse att mobilnätsåtkomst tillåts i dina inställningar";
"smartlist.accountsTitle" = "Konton";
-"smartlist.addAccountButton" = "+ Add Account";
-"smartlist.noNumber" = "Selected contact does not have any number";
-"smartlist.selectOneNumber" = "Select one of the numbers";
+"smartlist.addAccountButton" = "+ Lägg till konto";
+"smartlist.noNumber" = "Den valda kontakten har inget nummer";
+"smartlist.selectOneNumber" = "Välj ett nummer";
//Conversation
"conversation.messagePlaceholder" = "Skriv ditt meddelande...";
@@ -166,25 +166,26 @@
"accountPage.linkDeviceTitle" = "Koppla en annan enhet";
"accountPage.other" = "Annat";
"accountPage.removeAccountTitle" = "Ta bort konto";
-"accountPage.removeAccountMessage" = "By clicking \"Remove\" you will remove this account on this device! This action can not be undone. Also, your registered name can be lost.";
+"accountPage.removeAccountMessage" = "Genom att klicka \"Ta bort\" kommer du att ta bort detta konto från denna enhet. Denna åtgärd kan inte ångras. Ditt registrerade namn kan också förloras.";
"accountPage.removeAccountButton" = "Ta bort";
//Account
"account.sipUsername" = "Användarnamn";
"account.sipPassword" = "Lösenord";
"account.sipServer" = "SIP-server";
"account.port" = "Port";
-"account.createSipAccount" = "Create Sip Account";
-"account.usernameLabel" = "Enter Username";
+"account.proxyServer" = "Proxy";
+"account.createSipAccount" = "Skapa SIP-konto";
+"account.usernameLabel" = "Ange användarnamn";
"account.passwordLabel" = "Ange lösenord";
-"account.serverLabel" = "Enter Address";
-"account.portLabel" = "Enter Port Number";
-"account.accountStatus" = "Account Status";
-"account.enableAccount" = "Enable Account";
+"account.serverLabel" = "Ange adress";
+"account.portLabel" = "Ange portnummer";
+"account.accountStatus" = "Kontostatus";
+"account.enableAccount" = "Aktivera konto";
"account.statusOnline" = "Uppkopplad";
"account.statusOffline" = "Nerkopplad";
"account.statusConnecting" = "Ansluter";
"account.statusUnknown" = "Okänd";
-"account.statusConnectionerror" = "Connection Error";
+"account.statusConnectionerror" = "Anslutningsfel";
//Block List Page
"blockListPage.noBlockedContacts" = "Inga blockerade kontakter";
@@ -238,3 +239,7 @@
"generatedMessage.missedOutgoingCall" = "Missat utgående samtal";
"generatedMessage.missedIncomingCall" = "Missat inkommande samtal";
+//General Settings
+"generalSettings.title" = "Allmänna inställningar";
+"generalSettings.videoAcceleration" = "Enable video acceleration";
+
diff --git a/Ring/Ring/Resources/tr.lproj/Localizable.strings b/Ring/Ring/Resources/tr.lproj/Localizable.strings
index 6ac8acf..b5a3757 100644
--- a/Ring/Ring/Resources/tr.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/tr.lproj/Localizable.strings
@@ -38,10 +38,10 @@
"smartlist.searchBarPlaceholder" = "Ad girin...";
"smartlist.noNetworkConnectivity" = "Ağ bağlantısı yok";
"smartlist.cellularAccess" = "Ayarlarınızda hücresel erişim izni olduğundan emin olun.";
-"smartlist.accountsTitle" = "Accounts";
-"smartlist.addAccountButton" = "+ Add Account";
-"smartlist.noNumber" = "Selected contact does not have any number";
-"smartlist.selectOneNumber" = "Select one of the numbers";
+"smartlist.accountsTitle" = "Hesaplar";
+"smartlist.addAccountButton" = "+ Hesap Ekle";
+"smartlist.noNumber" = "Seçilen kişinin numarası yok";
+"smartlist.selectOneNumber" = "Numaralardan birini seçin";
//Conversation
"conversation.messagePlaceholder" = "İletinizi yazın...";
@@ -53,7 +53,7 @@
//Welcome Screen
"welcome.title" = "Jami'ye Hoşgeldiniz !";
-"welcome.text" = "Jami is a free and universal communication platform which preserves the users' privacy and freedoms";
+"welcome.text" = "Jami kullanıcılarının gizlilik ve özgürlüklerini sağlayan evrensel ve ücretsiz bir platformdur.";
"welcome.linkDevice" = "Bu aygıtı bir hesaba bağla";
"welcome.createAccount" = "Bir Jami hesabı oluştur";
@@ -63,7 +63,7 @@
"createProfile.title" = "Profilinizi kişiselleştirin";
"createProfile.enterNameLabel" = "Görünecek adı girin";
"createProfile.enterNamePlaceholder" = "Ad girin";
-"createProfile.subtitle" = "Your profile will be shared with your contacts. You can change it at any time.";
+"createProfile.subtitle" = "Profiliniz kişilerinizle paylaşılacak. İstediğiniz zaman değiştirebilirsiniz.";
"createProfile.createYourAvatar" = "Avatarınızı oluşturun";
//Create Account form
@@ -81,7 +81,7 @@
"createAccount.waitCreateAccountTitle" = "Hesap ekleniyor";
"createAccount.RegisterAUsername" = "Bir kullanıcı adı kaydedin";
"createAccount.ChooseAPassword" = "Hesabımı şifrele";
-"createAccount.PasswordInformation" = "Choose a password to encrypt your local account. Don’t forget it or you will not be able to recover your account";
+"createAccount.PasswordInformation" = "Yerel hesabınızı şifrelemek için bir parola seçin. Parolayı unutmayın yoksa hesabınızı kurtaramazsınız";
"createAccount.EnableNotifications" = "Bildirimler";
"createAccount.Recommended" = "(Önerilen)";
@@ -96,7 +96,7 @@
//Alerts
"alerts.accountCannotBeFoundTitle" = "Hesap bulunamadı";
-"alerts.accountCannotBeFoundMessage" = "Account couldn't be found on the Jami network. Make sure it was exported on Jami from an existing device, and that provided credentials are correct.";
+"alerts.accountCannotBeFoundMessage" = "Hesap Jami ağı üzerinde bulunamadı. Var olan bir aygıttan, Jami üzerinde dışa aktarıldığından ve sağladığı bilgilerin doğru olduğundan emin olun.";
"alerts.accountAddedTitle" = "Hesap Eklendi";
"alerts.accountNoNetworkTitle" = "Ağa bağlanılamıyor";
"alerts.accountNoNetworkMessage" = "Hesap eklenemiyor çünkü Jami dağıtık ağa bağlanamıyor. Bağlanabilirliğinizi denetleyin.";
@@ -108,7 +108,7 @@
"alerts.accountLinkedTitle" = "Hesap bağlama";
"alerts.dbFailedTitle" = "Jami başlatılırken bir hata oluştu";
"alerts.dbFailedMessage" = "Lütfen uygulamayı kapatın ve tekrar açmayı deneyin";
-"alerts.confirmBlockContact" = "Are you sure you want to block this contact? The conversation history with this contact will also be deleted permanently.";
+"alerts.confirmBlockContact" = "Bu kişiyi engellemek istediğinize emin misiniz? Bu kişiyle olan konuşma geçmişi de kalıcı olarak silinecek.";
"alerts.confirmBlockContactTitle" = "Kişiyi Engelle";
"alerts.confirmDeleteConversation" = "Bu konuşmayı kalıcı olarak silmek istediğinizden emin misiniz?";
"alerts.confirmDeleteConversationFromContact" = "Bu kişi ile konuşmayı kalıcı olarak silmek istediğinizden emin misiniz?";
@@ -121,7 +121,7 @@
"actions.deleteAction" = "Sil";
"actions.cancelAction" = "İptal";
"actions.clearAction" = "Clear";
-"actions.backAction" = "Back";
+"actions.backAction" = "Geri";
"alerts.incomingCallAllertTitle" = "Incoming call from ";
"alerts.incomingCallButtonAccept" = "Kabul et";
"alerts.incomingCallButtonIgnore" = "Göz ardı et";
@@ -129,7 +129,7 @@
//Calls
"calls.callItemTitle" = "Ara";
"calls.unknown" = "Bilinmeyen";
-"calls.incomingCallInfo" = "wants to talk to you";
+"calls.incomingCallInfo" = "seninle konuşmak istiyor";
"calls.ringing" = "Çalıyor...";
"calls.connecting" = "Bağlanıyor...";
"calls.callFinished" = "Arama sonlandırıldı";
@@ -143,48 +143,49 @@
"accountPage.enableProxy" = "Vekil sunucuyu etkinleştir";
"accountPage.blockedContacts" = "Engelleme listesi";
"accountPage.unblockContact" = "ENGELİ KALDIR";
-"accountPage.proxyAddressAlert" = "Provide proxy address";
+"accountPage.proxyAddressAlert" = "Vekil sunucu adresi sağlayın";
"accountPage.enableProxy" = "Vekil sunucuyu etkinleştir";
-"accountPage.noProxyExplanationLabel" = "Your device won't receive notifications when proxy is disabled";
+"accountPage.noProxyExplanationLabel" = "Vekil sunucu devre dışı bırakıldığında aygıtınız bildirim almayacak";
"accountPage.saveProxyAddress" = "Kaydet";
"accountPage.proxyPaceholder" = "Vekil sunucu adresi";
"accountPage.enableNotifications" = "Bildirimleri Etkinleştir";
"accountPage.proxyDisabledAlertTitle" = "Vekil Sunucu Devre dışı";
-"accountPage.proxyDisabledAlertBody" = "In order to receive notifications, please enable proxy";
+"accountPage.proxyDisabledAlertBody" = "Bildirimleri almak için lütfen vekil sunucuyu etkinleştirin";
"accountPage.revokeDeviceTitle" = "Aygıtı feshet ";
-"accountPage.revokeDeviceMessage" = "Are you sure you want to revoke this device? This action could not be undone.";
+"accountPage.revokeDeviceMessage" = "Bu aygıtı kaldırmak istediğinize emin misiniz? Bu işlem geri alınamaz.";
"accountPage.revokeDeviceButton" = "İptal etme";
"accountPage.revokeDevicePlaceholder" = "Parolanızı girin";
-"accountPage.deviceRevoked" = "Device revocation completed";
-"accountPage.deviceRevocationProgress" = "Revoking...";
-"accountPage.deviceRevocationSuccess" = "Device was revoked";
+"accountPage.deviceRevoked" = "Aygıt iptali tamamlandı";
+"accountPage.deviceRevocationProgress" = "İptal ediliyor...";
+"accountPage.deviceRevocationSuccess" = "Aygıt iptal edildi";
"accountPage.deviceRevocationTryAgain" = "Yeniden dene";
"accountPage.deviceRevocationWrongPassword" = "Geçersiz parola";
"accountPage.deviceRevocationUnknownDevice" = "Bilinmeyen aygıt";
-"accountPage.deviceRevocationError" = "Device revocation error";
+"accountPage.deviceRevocationError" = "Aygıt iptal hatası";
"accountPage.namePlaceholder" = "isim";
"accountPage.linkDeviceTitle" = "Diğer aygıtı bağla";
-"accountPage.other" = "Other";
-"accountPage.removeAccountTitle" = "Remove account";
+"accountPage.other" = "Diğer";
+"accountPage.removeAccountTitle" = "Hesabı Kaldır";
"accountPage.removeAccountMessage" = "By clicking \"Remove\" you will remove this account on this device! This action can not be undone. Also, your registered name can be lost.";
-"accountPage.removeAccountButton" = "Remove";
+"accountPage.removeAccountButton" = "Kaldır";
//Account
-"account.sipUsername" = "User Name";
-"account.sipPassword" = "Password";
-"account.sipServer" = "SIP Server";
-"account.port" = "Port";
-"account.createSipAccount" = "Create Sip Account";
-"account.usernameLabel" = "Enter Username";
-"account.passwordLabel" = "Enter Password";
-"account.serverLabel" = "Enter Address";
+"account.sipUsername" = "Kullanıcı Adı";
+"account.sipPassword" = "Parola";
+"account.sipServer" = "SIP sunucusu";
+"account.port" = "Delik";
+"account.proxyServer" = "Vekil";
+"account.createSipAccount" = "SİP Hesabı Oluştur";
+"account.usernameLabel" = "Kullanıcı Adını Girin";
+"account.passwordLabel" = "Parola Girin";
+"account.serverLabel" = "Adres Girin";
"account.portLabel" = "Enter Port Number";
-"account.accountStatus" = "Account Status";
-"account.enableAccount" = "Enable Account";
-"account.statusOnline" = "Online";
-"account.statusOffline" = "Offline";
-"account.statusConnecting" = "Connecting";
-"account.statusUnknown" = "Unknown";
-"account.statusConnectionerror" = "Connection Error";
+"account.accountStatus" = "Hesap Durumu";
+"account.enableAccount" = "Hesabı etkinleştir";
+"account.statusOnline" = "Çevrimiçi";
+"account.statusOffline" = "Çevrimdışı";
+"account.statusConnecting" = "Bağlanılıyor";
+"account.statusUnknown" = "Bilinmeyen";
+"account.statusConnectionerror" = "Bağlantı hatası";
//Block List Page
"blockListPage.noBlockedContacts" = "Engellenmiş kişi yok";
@@ -203,7 +204,7 @@
"contactPage.sendMessage" = "İleti Gönder";
"contactPage.clearConversation" = "Clear Chat";
"contactPage.blockContact" = "Kişiyi Engelle";
-"contactPage.removeConversation" = "Remove Conversation";
+"contactPage.removeConversation" = "Konuşmayı Kaldır";
//DataTransfer
"dataTransfer.readableStatusCreated" = "Başlatılıyor...";
@@ -238,3 +239,7 @@
"generatedMessage.missedOutgoingCall" = "Yanıtsız giden arama";
"generatedMessage.missedIncomingCall" = "Yanıtsız gelen arama";
+//General Settings
+"generalSettings.title" = "Genel ayarlar";
+"generalSettings.videoAcceleration" = "Enable video acceleration";
+
diff --git a/Ring/Ring/Resources/uk.lproj/Localizable.strings b/Ring/Ring/Resources/uk.lproj/Localizable.strings
index 467ad23..ffa552d 100644
--- a/Ring/Ring/Resources/uk.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/uk.lproj/Localizable.strings
@@ -173,6 +173,7 @@
"account.sipPassword" = "Пароль";
"account.sipServer" = "SIP Server";
"account.port" = "Порт";
+"account.proxyServer" = "Проксі";
"account.createSipAccount" = "Create Sip Account";
"account.usernameLabel" = "Enter Username";
"account.passwordLabel" = "Enter Password";
@@ -238,3 +239,7 @@
"generatedMessage.missedOutgoingCall" = "Пропущений вихідний виклик";
"generatedMessage.missedIncomingCall" = "Пропущений вхідний виклик";
+//General Settings
+"generalSettings.title" = "General settings";
+"generalSettings.videoAcceleration" = "Enable video acceleration";
+
diff --git a/Ring/Ring/Resources/zh-Hans-CN.lproj/Localizable.strings b/Ring/Ring/Resources/zh-Hans-CN.lproj/Localizable.strings
index f103bef..503be74 100644
--- a/Ring/Ring/Resources/zh-Hans-CN.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/zh-Hans-CN.lproj/Localizable.strings
@@ -173,6 +173,7 @@
"account.sipPassword" = "密码";
"account.sipServer" = "SIP Server";
"account.port" = "端口";
+"account.proxyServer" = "代理";
"account.createSipAccount" = "Create Sip Account";
"account.usernameLabel" = "Enter Username";
"account.passwordLabel" = "Enter Password";
@@ -238,3 +239,7 @@
"generatedMessage.missedOutgoingCall" = "去电未接";
"generatedMessage.missedIncomingCall" = "未接来电";
+//General Settings
+"generalSettings.title" = "General settings";
+"generalSettings.videoAcceleration" = "Enable video acceleration";
+
diff --git a/Ring/Ring/Resources/zh-Hans.lproj/Localizable.strings b/Ring/Ring/Resources/zh-Hans.lproj/Localizable.strings
index 064650a..b41166d 100644
--- a/Ring/Ring/Resources/zh-Hans.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/zh-Hans.lproj/Localizable.strings
@@ -39,9 +39,9 @@
"smartlist.noNetworkConnectivity" = "沒有網路連接";
"smartlist.cellularAccess" = "確定在您的設定中已授權使用行動通訊";
"smartlist.accountsTitle" = "帳號";
-"smartlist.addAccountButton" = "+ Add Account";
-"smartlist.noNumber" = "Selected contact does not have any number";
-"smartlist.selectOneNumber" = "Select one of the numbers";
+"smartlist.addAccountButton" = "+ 新增帳號";
+"smartlist.noNumber" = "選定的連絡人沒有任何號碼";
+"smartlist.selectOneNumber" = "選取其中一個號碼";
//Conversation
"conversation.messagePlaceholder" = "輸入您的訊息……";
@@ -166,25 +166,26 @@
"accountPage.linkDeviceTitle" = "連結其他裝置";
"accountPage.other" = "其他";
"accountPage.removeAccountTitle" = "移除帳號";
-"accountPage.removeAccountMessage" = "By clicking \"Remove\" you will remove this account on this device! This action can not be undone. Also, your registered name can be lost.";
+"accountPage.removeAccountMessage" = "點選「移除」後，您將會在此裝置上移除此帳號！此動作不可復原。同時，您已註冊的名稱也將會遺失。";
"accountPage.removeAccountButton" = "移除";
//Account
"account.sipUsername" = "使用者名稱";
"account.sipPassword" = "密碼";
"account.sipServer" = "SIP 伺服器";
"account.port" = "連接埠";
-"account.createSipAccount" = "Create Sip Account";
-"account.usernameLabel" = "Enter Username";
+"account.proxyServer" = "代理服務器";
+"account.createSipAccount" = "建立 SIP 帳號";
+"account.usernameLabel" = "輸入使用者名稱";
"account.passwordLabel" = "輸入密碼";
-"account.serverLabel" = "Enter Address";
-"account.portLabel" = "Enter Port Number";
-"account.accountStatus" = "Account Status";
-"account.enableAccount" = "Enable Account";
+"account.serverLabel" = "輸入地址";
+"account.portLabel" = "輸入連接埠號";
+"account.accountStatus" = "帳號狀態";
+"account.enableAccount" = "啟用帳號";
"account.statusOnline" = "線上";
"account.statusOffline" = "離線";
"account.statusConnecting" = "連接中";
"account.statusUnknown" = "未知";
-"account.statusConnectionerror" = "Connection Error";
+"account.statusConnectionerror" = "連線錯誤";
//Block List Page
"blockListPage.noBlockedContacts" = "沒有已封鎖的聯絡人";
@@ -238,3 +239,7 @@
"generatedMessage.missedOutgoingCall" = "未接去電";
"generatedMessage.missedIncomingCall" = "未接來電";
+//General Settings
+"generalSettings.title" = "一般設定";
+"generalSettings.videoAcceleration" = "Enable video acceleration";
+
diff --git a/Ring/Ring/Resources/zh.lproj/Localizable.strings b/Ring/Ring/Resources/zh.lproj/Localizable.strings
index a28c398..cbd06f3 100644
--- a/Ring/Ring/Resources/zh.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/zh.lproj/Localizable.strings
@@ -38,7 +38,7 @@
"smartlist.searchBarPlaceholder" = "Enter name...";
"smartlist.noNetworkConnectivity" = "No network connectivity";
"smartlist.cellularAccess" = "Be sure cellular access is granted in your settings";
-"smartlist.accountsTitle" = "Accounts";
+"smartlist.accountsTitle" = "帳號";
"smartlist.addAccountButton" = "+ Add Account";
"smartlist.noNumber" = "Selected contact does not have any number";
"smartlist.selectOneNumber" = "Select one of the numbers";
@@ -170,9 +170,10 @@
"accountPage.removeAccountButton" = "Remove";
//Account
"account.sipUsername" = "User Name";
-"account.sipPassword" = "Password";
+"account.sipPassword" = "密码";
"account.sipServer" = "SIP Server";
-"account.port" = "Port";
+"account.port" = "埠";
+"account.proxyServer" = "代理";
"account.createSipAccount" = "Create Sip Account";
"account.usernameLabel" = "Enter Username";
"account.passwordLabel" = "Enter Password";
@@ -183,7 +184,7 @@
"account.statusOnline" = "Online";
"account.statusOffline" = "Offline";
"account.statusConnecting" = "Connecting";
-"account.statusUnknown" = "Unknown";
+"account.statusUnknown" = "未知";
"account.statusConnectionerror" = "Connection Error";
//Block List Page
@@ -238,3 +239,7 @@
"generatedMessage.missedOutgoingCall" = "Missed outgoing call";
"generatedMessage.missedIncomingCall" = "Missed incoming call";
+//General Settings
+"generalSettings.title" = "General settings";
+"generalSettings.videoAcceleration" = "Enable video acceleration";
+