[Pkg-privacy-commits] [ricochet-im] 01/04: New upstream version 1.1.4
Sascha Steinbiss
satta at debian.org
Sun Nov 20 08:56:22 UTC 2016
This is an automated email from the git hooks/post-receive script.
satta pushed a commit to branch master
in repository ricochet-im.
commit 476d8bceab1ac6ded5e3dca92d87ceb68c058882
Author: Sascha Steinbiss <satta at debian.org>
Date: Fri Nov 18 21:12:55 2016 +0000
New upstream version 1.1.4
---
BUILDING.md | 4 +-
LICENSE | 2 +-
README.md | 4 +-
packaging/installer/building.txt | 3 +-
packaging/installer/installer.iss | 48 +--
packaging/installer/prepare.bat | 5 +
protobuf.pri | 2 +-
ricochet.pro | 22 +-
ricochetscreen.png | Bin 0 -> 54918 bytes
src/main.cpp | 9 +-
src/ui/LanguagesModel.cpp | 15 +
src/ui/LanguagesModel.h | 5 +
src/ui/qml/GeneralPreferences.qml | 40 +++
src/ui/qml/LanguagePreferences.qml | 62 ----
src/ui/qml/MessageDelegate.qml | 14 +-
src/ui/qml/PreferencesDialog.qml | 5 -
src/ui/qml/qml.qrc | 1 -
src/utils/CryptoKey.cpp | 20 +-
src/utils/SecureRNG.cpp | 2 +-
translation/embedded.qrc | 6 +
translation/inno/Albanian.isl | 321 +++++++++++++++++++
translation/inno/Estonian.isl | 341 +++++++++++++++++++++
translation/installer_de.isl | 2 +-
translation/installer_et_EE.isl | 14 +
translation/installer_it_IT.isl | 14 +
translation/installer_nb.isl | 14 +
translation/installer_pt_PT.isl | 14 +
translation/installer_ru.isl | 4 +-
translation/installer_sq.isl | 14 +
translation/installer_zh_HK.isl | 14 +
translation/ricochet_bg.ts | 81 ++---
translation/ricochet_cs.ts | 95 +++---
translation/ricochet_da.ts | 81 ++---
translation/ricochet_de.ts | 81 ++---
translation/ricochet_en.ts | 74 ++---
translation/ricochet_es.ts | 81 ++---
translation/{ricochet_da.ts => ricochet_et_EE.ts} | 307 ++++++++++---------
translation/ricochet_fi.ts | 81 ++---
translation/ricochet_fil_PH.ts | 74 ++---
translation/ricochet_fr.ts | 81 ++---
translation/ricochet_he.ts | 193 ++++++------
translation/ricochet_it.ts | 81 ++---
translation/{ricochet_it.ts => ricochet_it_IT.ts} | 183 +++++------
translation/{ricochet_da.ts => ricochet_nb.ts} | 277 +++++++++--------
translation/ricochet_nl_NL.ts | 81 ++---
translation/ricochet_pl.ts | 81 ++---
translation/ricochet_pt_BR.ts | 81 ++---
.../{ricochet_pt_BR.ts => ricochet_pt_PT.ts} | 177 ++++++-----
translation/ricochet_ru.ts | 74 ++---
translation/ricochet_sl.ts | 193 ++++++------
translation/{ricochet_sv.ts => ricochet_sq.ts} | 307 ++++++++++---------
translation/ricochet_sv.ts | 81 ++---
translation/ricochet_tr.ts | 83 ++---
translation/ricochet_uk.ts | 81 ++---
translation/ricochet_zh.ts | 207 +++++++------
translation/{ricochet_da.ts => ricochet_zh_HK.ts} | 309 ++++++++++---------
56 files changed, 2740 insertions(+), 1806 deletions(-)
diff --git a/BUILDING.md b/BUILDING.md
index 9891df9..1f29f9b 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -67,7 +67,7 @@ To take full advantage of the sanitizer options, you may need to install `libasa
You will need:
* Xcode (for toolchain)
- * Qt 5 - preferably the [Qt SDK](https://qt-project.org/downloads)
+ * Qt 5 - preferably the [Qt SDK](https://www.qt.io/download/)
* Protocol Buffers (libprotobuf, protoc) - `brew install protobuf`
You can either load `ricochet.pro` in Qt Creator and build normally, or build command-line with:
@@ -97,7 +97,7 @@ Building for Windows is difficult. The process and scripts used for release buil
For development builds, you will want:
* Visual Studio C++ or MinGW
- * Qt 5 - preferably the [Qt SDK](https://qt-project.org/downloads)
+ * Qt 5 - preferably the [Qt SDK](https://www.qt.io/download/)
* OpenSSL (including libs and headers)
* Protocol Buffers >= 2.6.0
diff --git a/LICENSE b/LICENSE
index 1cb2bb9..ca58b02 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,5 @@
Ricochet - https://ricochet.im/
-Copyright (C) 2014, John Brooks <john.brooks at dereferenced.net>
+Copyright (C) 2014-2016, John Brooks <john.brooks at dereferenced.net>
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
diff --git a/README.md b/README.md
index ea934d7..bc8420a 100644
--- a/README.md
+++ b/README.md
@@ -6,6 +6,8 @@ Ricochet is an experimental kind of instant messaging that **doesn't trust anyon
* There are no servers or operators that could be compromised, exposing your information.
* It's cross-platform and easy for non-technical users.
+
+
### How it works
Ricochet is a peer-to-peer instant messaging system built on the Tor Network [hidden services](https://www.torproject.org/docs/hidden-services.html.en). Your login is your hidden service address, and contacts connect to you (not an intermediate server) through Tor. The rendezvous system makes it extremely hard for anyone to learn your identity from your address.
@@ -14,7 +16,7 @@ Ricochet is not affiliated with or endorsed by The Tor Project.
For more information, you can [read about Tor](https://www.torproject.org/about/overview.html.en) and [learn about Ricochet's design](https://github.com/ricochet-im/ricochet/blob/master/doc/design.md) or [protocol](https://github.com/ricochet-im/ricochet/blob/master/doc/protocol.md) (or the [old protocol](https://github.com/ricochet-im/ricochet/blob/master/doc/deprecated/protocol-1.0.txt)). Everything is [open-source](https://github.com/ricochet-im/ricochet/blob/master/LICENSE) and open [...]
### Experimental
-This software is an experiment. It hasn't been audited or formally reviewed by anyone. Security and anonymity are difficult topics, and you should carefully evaluate your risks and exposure with any software. *Do not rely on Ricochet for your safety* unless you have more trust in my work than it deserves. That said, I believe it does more to try to protect your privacy than any similar software, and is the best chance you have of witholding your personal information.
+This software is an experiment. It hasn't been audited or formally reviewed by anyone. Security and anonymity are difficult topics, and you should carefully evaluate your risks and exposure with any software. *Do not rely on Ricochet for your safety* unless you have more trust in my work than it deserves. That said, I believe it does more to try to protect your privacy than any similar software, and is the best chance you have of withholding your personal information.
### Downloads
diff --git a/packaging/installer/building.txt b/packaging/installer/building.txt
index 4f22664..86c3e68 100644
--- a/packaging/installer/building.txt
+++ b/packaging/installer/building.txt
@@ -1,7 +1,6 @@
Building the installer requires Inno Setup; see http://www.jrsoftware.org/isinfo.php
-Place tor.exe and ricochet.exe in this directory. You will also need the CRT
-DLLs from the version of MSVC used, e.g. msvcp110.dll and msvcr110.dll.
+Place tor.exe and ricochet.exe in this directory.
In console:
diff --git a/packaging/installer/installer.iss b/packaging/installer/installer.iss
index ec5b6af..ce1944c 100644
--- a/packaging/installer/installer.iss
+++ b/packaging/installer/installer.iss
@@ -18,14 +18,12 @@ VersionInfoDescription=Ricochet
VersionInfoProductName=Ricochet
WizardImageFile=SetupModern11.bmp
ShowLanguageDialog=no
-SetupIconFile=..\..\icons\ricochet.ico
+SetupIconFile=ricochet.ico
[Files]
Source: ricochet.exe; DestDir: {app}; DestName: ricochet.exe; Flags: replacesameversion
-Source: ..\..\LICENSE; DestDir: {app}
+Source: LICENSE; DestDir: {app}
Source: tor.exe; DestDir: {app}; Flags: replacesameversion uninsrestartdelete
Source: Qt\*; DestDir: {app}; Flags: recursesubdirs
-Source: MSVCP120.DLL; DestDir: {app}; Flags: skipifsourcedoesntexist
-Source: MSVCR120.DLL; DestDir: {app}; Flags: skipifsourcedoesntexist
[Icons]
Name: {group}\Ricochet; Filename: {app}\ricochet.exe; WorkingDir: {app}; Comment: {cm:AppTitle}; Check: not IsPortableInstall
Name: {group}\{cm:UninstallShortcut}; Filename: {uninstallexe}; Check: not IsPortableInstall
@@ -34,24 +32,30 @@ Name: {app}\config; Type: filesandordirs
[Run]
Filename: {app}\ricochet.exe; WorkingDir: {app}; Description: {cm:RunShortcut}; Flags: postinstall nowait
[Languages]
-Name: "bg"; MessagesFile: "..\..\translation\inno\Bulgarian.isl,..\..\translation\installer_bg.isl"
-Name: "cs"; MessagesFile: "compiler:Languages\Czech.isl,..\..\translation\installer_cs.isl"
-Name: "da"; MessagesFile: "compiler:Languages\Danish.isl,..\..\translation\installer_da.isl"
-Name: "de"; MessagesFile: "compiler:Languages\German.isl,..\..\translation\installer_de.isl"
-Name: "en"; MessagesFile: "compiler:Default.isl,..\..\translation\installer_en.isl"
-Name: "es"; MessagesFile: "compiler:Languages\Spanish.isl,..\..\translation\installer_es.isl"
-Name: "fi"; MessagesFile: "compiler:Languages\Finnish.isl,..\..\translation\installer_fi.isl"
-Name: "fr"; MessagesFile: "compiler:Languages\French.isl,..\..\translation\installer_fr.isl"
-Name: "it"; MessagesFile: "compiler:Languages\Italian.isl,..\..\translation\installer_it.isl"
-Name: "nl_NL"; MessagesFile: "compiler:Languages\Dutch.isl,..\..\translation\installer_nl_NL.isl"
-Name: "pt_BR"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl,..\..\translation\installer_pt_BR.isl"
-Name: "ru"; MessagesFile: "compiler:Languages\Russian.isl,..\..\translation\installer_ru.isl"
-Name: "sv"; MessagesFile: "..\..\translation\inno\Swedish.isl,..\..\translation\installer_sv.isl"
-Name: "tr"; MessagesFile: "compiler:Languages\Turkish.isl,..\..\translation\installer_tr.isl"
-Name: "uk"; MessagesFile: "compiler:Languages\Ukrainian.isl,..\..\translation\installer_uk.isl"
-Name: "pl"; MessagesFile: "compiler:Languages\Polish.isl,..\..\translation\installer_pl.isl"
-Name: "sl"; MessagesFile: "compiler:Languages\Slovenian.isl,..\..\translation\installer_sl.isl"
-Name: "zh"; MessagesFile: "..\..\translation\inno\ChineseSimplified.isl,..\..\translation\installer_zh.isl"
+Name: "bg"; MessagesFile: "translation\inno\Bulgarian.isl,translation\installer_bg.isl"
+Name: "cs"; MessagesFile: "compiler:Languages\Czech.isl,translation\installer_cs.isl"
+Name: "da"; MessagesFile: "compiler:Languages\Danish.isl,translation\installer_da.isl"
+Name: "de"; MessagesFile: "compiler:Languages\German.isl,translation\installer_de.isl"
+Name: "en"; MessagesFile: "compiler:Default.isl,translation\installer_en.isl"
+Name: "es"; MessagesFile: "compiler:Languages\Spanish.isl,translation\installer_es.isl"
+Name: "et_EE"; MessagesFile: "translation\inno\Estonian.isl,translation\installer_et_EE.isl"
+Name: "fi"; MessagesFile: "compiler:Languages\Finnish.isl,translation\installer_fi.isl"
+Name: "fr"; MessagesFile: "compiler:Languages\French.isl,translation\installer_fr.isl"
+Name: "it"; MessagesFile: "compiler:Languages\Italian.isl,translation\installer_it.isl"
+Name: "it_IT"; MessagesFile: "compiler:Languages\Italian.isl,translation\installer_it_IT.isl"
+Name: "nb"; MessagesFile: "compiler:Languages\Norwegian.isl,translation\installer_nb.isl"
+Name: "nl_NL"; MessagesFile: "compiler:Languages\Dutch.isl,translation\installer_nl_NL.isl"
+Name: "pt_BR"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl,translation\installer_pt_BR.isl"
+Name: "pt_PT"; MessagesFile: "compiler:Languages\Portuguese.isl,translation\installer_pt_PT.isl"
+Name: "ru"; MessagesFile: "compiler:Languages\Russian.isl,translation\installer_ru.isl"
+Name: "sv"; MessagesFile: "translation\inno\Swedish.isl,translation\installer_sv.isl"
+Name: "sq"; MessagesFile: "translation\inno\Albanian.isl,translation\installer_sq.isl"
+Name: "tr"; MessagesFile: "compiler:Languages\Turkish.isl,translation\installer_tr.isl"
+Name: "uk"; MessagesFile: "compiler:Languages\Ukrainian.isl,translation\installer_uk.isl"
+Name: "pl"; MessagesFile: "compiler:Languages\Polish.isl,translation\installer_pl.isl"
+Name: "sl"; MessagesFile: "compiler:Languages\Slovenian.isl,translation\installer_sl.isl"
+Name: "zh"; MessagesFile: "translation\inno\ChineseSimplified.isl,translation\installer_zh.isl"
+Name: "zh_HK"; MessagesFile: "translation\inno\ChineseSimplified.isl,translation\installer_zh_HK.isl"
[Code]
// http://www.vincenzo.net/isxkb/index.php?title=Obtaining_the_application's_version
diff --git a/packaging/installer/prepare.bat b/packaging/installer/prepare.bat
index fa5b503..47588c9 100644
--- a/packaging/installer/prepare.bat
+++ b/packaging/installer/prepare.bat
@@ -1,3 +1,8 @@
if exist "Qt\" rd /q /s Qt
windeployqt --qmldir ..\..\src\ui\qml --dir Qt ricochet.exe
if exist "Qt\qmltooling" rd /q /s Qt\qmltooling
+copy /Y ..\..\icons\ricochet.ico ricochet.ico
+copy /Y ..\..\LICENSE LICENSE
+if not exist "translation\" mkdir translation
+copy /Y ..\..\translation\installer_*.isl translation\
+xcopy /Y ..\..\translation\inno translation\inno\
diff --git a/protobuf.pri b/protobuf.pri
index bf942ea..8261470 100644
--- a/protobuf.pri
+++ b/protobuf.pri
@@ -32,7 +32,7 @@ win32 {
isEmpty(PROTOBUFDIR):error(You must pass PROTOBUFDIR=path/to/protobuf to qmake on this platform)
INCLUDEPATH += $${PROTOBUFDIR}/include
LIBS += -L$${PROTOBUFDIR}/lib -lprotobuf
- PROTOC = $${PROTOBUFDIR}/bin/protoc.exe
+ contains(QMAKE_HOST.os,Windows):PROTOC = $${PROTOBUFDIR}/bin/protoc.exe
}
protobuf_decl.name = protobuf headers
diff --git a/ricochet.pro b/ricochet.pro
index fea5379..03ac281 100644
--- a/ricochet.pro
+++ b/ricochet.pro
@@ -38,7 +38,7 @@ TEMPLATE = app
QT += core gui network quick widgets multimedia
CONFIG += c++11
-VERSION = 1.1.3
+VERSION = 1.1.4
# Use CONFIG+=no-hardened to disable compiler hardening options
!CONFIG(no-hardened) {
@@ -130,9 +130,17 @@ win32 {
}
# required by openssl
- LIBS += -lUser32 -lGdi32 -ladvapi32
+ LIBS += -luser32 -lgdi32 -ladvapi32
}
+# Exclude unneeded plugins from static builds
+QTPLUGIN.playlistformats = -
+QTPLUGIN.imageformats = -
+QTPLUGIN.printsupport = -
+QTPLUGIN.mediaservice = -
+# Include Linux input plugins, which are missing by default, to provide complex input support. See issue #60.
+unix:!macx:QTPLUGIN.platforminputcontexts = composeplatforminputcontextplugin ibusplatforminputcontextplugin
+
DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII
SOURCES += src/main.cpp \
@@ -253,10 +261,16 @@ TRANSLATIONS += \
translation/ricochet_sv.ts \
translation/ricochet_he.ts \
translation/ricochet_sl.ts \
- translation/ricochet_zh.ts
+ translation/ricochet_zh.ts \
+ translation/ricochet_et_EE.ts \
+ translation/ricochet_it_IT.ts \
+ translation/ricochet_nb.ts \
+ translation/ricochet_pt_PT.ts \
+ translation/ricochet_sq.ts \
+ translation/ricochet_zh_HK.ts
isEmpty(QMAKE_LRELEASE) {
- win32:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\lrelease.exe
+ contains(QMAKE_HOST.os,Windows):QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease.exe
else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease
}
diff --git a/ricochetscreen.png b/ricochetscreen.png
new file mode 100644
index 0000000..e7d6c31
Binary files /dev/null and b/ricochetscreen.png differ
diff --git a/src/main.cpp b/src/main.cpp
index 54f64b8..4fda541 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -60,9 +60,12 @@ int main(int argc, char *argv[])
This will also ensure full PAX/Grsecurity protections. */
qputenv("QV4_FORCE_INTERPRETER", "1");
qputenv("QT_ENABLE_REGEXP_JIT", "0");
+ /* Use QtQuick 2D renderer by default; ignored if not available */
+ if (qEnvironmentVariableIsEmpty("QMLSCENE_DEVICE"))
+ qputenv("QMLSCENE_DEVICE", "softwarecontext");
QApplication a(argc, argv);
- a.setApplicationVersion(QLatin1String("1.1.3"));
+ a.setApplicationVersion(QLatin1String("1.1.4"));
a.setOrganizationName(QStringLiteral("Ricochet"));
#if !defined(Q_OS_WIN) && !defined(Q_OS_MAC)
@@ -83,7 +86,11 @@ int main(int argc, char *argv[])
initTranslation();
/* Initialize OpenSSL's allocator */
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
CRYPTO_malloc_init();
+#else
+ OPENSSL_malloc_init();
+#endif
/* Seed the OpenSSL RNG */
if (!SecureRNG::seed())
diff --git a/src/ui/LanguagesModel.cpp b/src/ui/LanguagesModel.cpp
index c7fa2c9..3f7eb2d 100644
--- a/src/ui/LanguagesModel.cpp
+++ b/src/ui/LanguagesModel.cpp
@@ -78,3 +78,18 @@ QHash<int, QByteArray> LanguagesModel::roleNames() const
return roles;
}
+QString LanguagesModel::localeID(int row)
+{
+ if (row >= 0 && row < languages.length())
+ return languages[row].localeID;
+ return QString();
+}
+
+int LanguagesModel::rowForLocaleID(const QString &localeID)
+{
+ for (int i = 0; i < languages.length(); i++) {
+ if (languages[i].localeID == localeID)
+ return i;
+ }
+ return -1;
+}
diff --git a/src/ui/LanguagesModel.h b/src/ui/LanguagesModel.h
index 5e9a3f7..797e8ee 100644
--- a/src/ui/LanguagesModel.h
+++ b/src/ui/LanguagesModel.h
@@ -37,6 +37,8 @@
class LanguagesModel : public QAbstractListModel
{
+ Q_OBJECT
+
public:
enum {
NameRole = Qt::UserRole,
@@ -49,6 +51,9 @@ public:
virtual QVariant data(const QModelIndex &index, int role) const;
virtual QHash<int,QByteArray> roleNames() const;
+ Q_INVOKABLE QString localeID(int index);
+ Q_INVOKABLE int rowForLocaleID(const QString &localeID);
+
private:
struct LanguageEntry
{
diff --git a/src/ui/qml/GeneralPreferences.qml b/src/ui/qml/GeneralPreferences.qml
index 1f057a5..845c7fd 100644
--- a/src/ui/qml/GeneralPreferences.qml
+++ b/src/ui/qml/GeneralPreferences.qml
@@ -1,6 +1,7 @@
import QtQuick 2.0
import QtQuick.Controls 1.0
import QtQuick.Layouts 1.0
+import im.ricochet 1.0
ColumnLayout {
anchors {
@@ -47,6 +48,45 @@ ColumnLayout {
}
}
+ RowLayout {
+ z: 2
+ Label { text: qsTr("Language") }
+
+ ComboBox {
+ id: languageBox
+ model: languageModel
+ textRole: "nativeName"
+ currentIndex: languageModel.rowForLocaleID(uiSettings.data.language)
+ Layout.minimumWidth: 200
+
+ LanguagesModel {
+ id: languageModel
+ }
+
+ onActivated: {
+ var localeID = languageModel.localeID(index)
+ uiSettings.write("language", localeID)
+ restartBubble.displayed = true
+ bubbleResetTimer.start()
+ }
+
+ Bubble {
+ id: restartBubble
+ target: languageBox
+ text: qsTr("Restart Ricochet to apply changes")
+ displayed: false
+ horizontalAlignment: Qt.AlignRight
+
+ Timer {
+ id: bubbleResetTimer
+ interval: 3000
+ onTriggered: restartBubble.displayed = false
+ }
+ }
+ }
+ }
+
+
Item {
Layout.fillHeight: true
Layout.fillWidth: true
diff --git a/src/ui/qml/LanguagePreferences.qml b/src/ui/qml/LanguagePreferences.qml
deleted file mode 100644
index 000008f..0000000
--- a/src/ui/qml/LanguagePreferences.qml
+++ /dev/null
@@ -1,62 +0,0 @@
-import QtQuick 2.0
-import QtQuick.Controls 1.0
-import QtQuick.Layouts 1.0
-import im.ricochet 1.0
-
-ColumnLayout {
- anchors {
- fill: parent
- margins: 8
- }
-
- property string previousLanguage: uiSettings.data.language
-
- ExclusiveGroup {
- id: languageGroup
- }
-
- Item { height: 8 }
-
- Label {
- Layout.fillWidth: true
- text: qsTr("Select Language")
- }
-
- Item { height: 10 }
-
- GridLayout {
- columns: 2
-
- Repeater {
- model: LanguagesModel { }
- delegate: RadioButton {
- id: languageSelection
- Layout.fillWidth: true
- text: nativeName
- checked: localeID === uiSettings.data.language
- exclusiveGroup: languageGroup
- onCheckedChanged: {
- if (checked && previousLanguage !== localeID) {
- restartNotification.visible = true
- uiSettings.write("language", localeID)
- }
- }
- }
- }
- }
-
- Item { height: 15 }
-
- Label {
- id: restartNotification
- text: qsTr("Restart Ricochet to apply changes")
- Layout.fillWidth: true
- horizontalAlignment: Text.AlignHCenter
- visible: false
- }
-
- Item {
- Layout.fillHeight: true
- Layout.fillWidth: true
- }
-}
diff --git a/src/ui/qml/MessageDelegate.qml b/src/ui/qml/MessageDelegate.qml
index d328a11..869ce66 100644
--- a/src/ui/qml/MessageDelegate.qml
+++ b/src/ui/qml/MessageDelegate.qml
@@ -81,13 +81,6 @@ Column {
Behavior on opacity { NumberAnimation { } }
}
- MouseArea {
- anchors.fill: parent
- acceptedButtons: Qt.RightButton
-
- onClicked: delegate.showContextMenu()
- }
-
TextEdit {
id: textField
width: Math.min(implicitWidth, background.__maxWidth)
@@ -116,6 +109,13 @@ Column {
if (textField.hasOwnProperty('linkHovered'))
textField.linkHovered.connect(function() { })
}
+
+ MouseArea {
+ anchors.fill: parent
+ acceptedButtons: Qt.RightButton
+
+ onClicked: delegate.showContextMenu(parent.hoveredLink)
+ }
}
}
diff --git a/src/ui/qml/PreferencesDialog.qml b/src/ui/qml/PreferencesDialog.qml
index a049164..9a9a2b4 100644
--- a/src/ui/qml/PreferencesDialog.qml
+++ b/src/ui/qml/PreferencesDialog.qml
@@ -43,11 +43,6 @@ ApplicationWindow {
}
Tab {
- title: qsTr("Language")
- source: Qt.resolvedUrl("LanguagePreferences.qml")
- }
-
- Tab {
title: qsTr("Contacts")
source: Qt.resolvedUrl("ContactPreferences.qml")
}
diff --git a/src/ui/qml/qml.qrc b/src/ui/qml/qml.qrc
index 8d9ce23..0ea0ed5 100644
--- a/src/ui/qml/qml.qrc
+++ b/src/ui/qml/qml.qrc
@@ -33,7 +33,6 @@
<file>MainToolBar.qml</file>
<file>UnreadCountBadge.qml</file>
<file>GeneralPreferences.qml</file>
- <file>LanguagePreferences.qml</file>
<file>AudioNotifications.qml</file>
<file>utils.js</file>
</qresource>
diff --git a/src/utils/CryptoKey.cpp b/src/utils/CryptoKey.cpp
index cf921e8..0ddaa7e 100644
--- a/src/utils/CryptoKey.cpp
+++ b/src/utils/CryptoKey.cpp
@@ -35,9 +35,19 @@
#include "Useful.h"
#include <QtDebug>
#include <QFile>
+#include <openssl/bn.h>
#include <openssl/bio.h>
#include <openssl/pem.h>
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+void RSA_get0_factors(const RSA *r, const BIGNUM **p, const BIGNUM **q)
+{
+ *p = r->p;
+ *q = r->q;
+}
+#define RSA_bits(o) (BN_num_bits((o)->n))
+#endif
+
void base32_encode(char *dest, unsigned destlen, const char *src, unsigned srclen);
bool base32_decode(char *dest, unsigned destlen, const char *src, unsigned srclen);
@@ -119,12 +129,18 @@ bool CryptoKey::loadFromFile(const QString &path, KeyType type, KeyFormat format
bool CryptoKey::isPrivate() const
{
- return isLoaded() && d->key->p != 0;
+ if (!isLoaded()) {
+ return false;
+ } else {
+ const BIGNUM *p, *q;
+ RSA_get0_factors(d->key, &p, &q);
+ return (p != 0);
+ }
}
int CryptoKey::bits() const
{
- return isLoaded() ? BN_num_bits(d->key->n) : 0;
+ return isLoaded() ? RSA_bits(d->key) : 0;
}
QByteArray CryptoKey::publicKeyDigest() const
diff --git a/src/utils/SecureRNG.cpp b/src/utils/SecureRNG.cpp
index 674ad16..3a6eacd 100644
--- a/src/utils/SecureRNG.cpp
+++ b/src/utils/SecureRNG.cpp
@@ -37,7 +37,7 @@
#include <limits.h>
#ifdef Q_OS_WIN
-#include <Wincrypt.h>
+#include <wincrypt.h>
#endif
#if QT_VERSION >= 0x040700
diff --git a/translation/embedded.qrc b/translation/embedded.qrc
index 1080442..b759e75 100644
--- a/translation/embedded.qrc
+++ b/translation/embedded.qrc
@@ -20,5 +20,11 @@
<file>ricochet_he.qm</file>
<file>ricochet_sl.qm</file>
<file>ricochet_zh.qm</file>
+ <file>ricochet_et_EE.qm</file>
+ <file>ricochet_it_IT.qm</file>
+ <file>ricochet_nb.qm</file>
+ <file>ricochet_pt_PT.qm</file>
+ <file>ricochet_sq.qm</file>
+ <file>ricochet_zh_HK.qm</file>
</qresource>
</RCC>
diff --git a/translation/inno/Albanian.isl b/translation/inno/Albanian.isl
new file mode 100644
index 0000000..2ab6dac
--- /dev/null
+++ b/translation/inno/Albanian.isl
@@ -0,0 +1,321 @@
+; *** Inno Setup version 5.1.11+ Albanian messages ***
+;
+; To download user-contributed translations of this file, go to:
+; http://www.jrsoftware.org/files/istrans/
+;
+; Note: When translating this text, do not add periods (.) to the end of
+; messages that didn't have them already, because on those messages Inno
+; Setup adds the periods automatically (appending a period would result in
+; two periods being displayed).
+;
+; P�rkthyer nga Besmir Godole
+; Posta-e: bgodole at gmail.com
+; M� kontaktoni me post�-e p�r ndonj� gabim ose sugjerim rreth p�rkthimit.
+
+[LangOptions]
+; The following three entries are very important. Be sure to read and
+; understand the '[LangOptions] section' topic in the help file.
+LanguageName=Albanian
+LanguageID=$041C
+LanguageCodePage=1252
+; If the language you are translating to requires special font faces or
+; sizes, uncomment any of the following entries and change them accordingly.
+;DialogFontName=
+;DialogFontSize=8
+;WelcomeFontName=Verdana
+;WelcomeFontSize=12
+;TitleFontName=Arial
+;TitleFontSize=29
+;CopyrightFontName=Arial
+;CopyrightFontSize=8
+
+[Messages]
+
+; *** Application titles
+SetupAppTitle=Sistemim
+SetupWindowTitle=Sistemon - %1
+UninstallAppTitle=�instalim
+UninstallAppFullTitle=�instalon %1
+
+; *** Misc. common
+InformationTitle=Informacion
+ConfirmTitle=Miratim
+ErrorTitle=Gabim
+
+; *** SetupLdr messages
+SetupLdrStartupMessage=Tani do instalosh %1. Do vijosh?
+LdrCannotCreateTemp=Nuk mund t� krijohet nj� sked� koh�shkurt�r. Nd�rpritet sistemimi
+LdrCannotExecTemp=Nuk mund t� ekzekutohet skeda n� direktorin� koh�shkurt�r. Nd�rpritet sistemimi
+
+; *** Startup error messages
+LastErrorMessage=%1.%n%nGabim %2: %3
+SetupFileMissing=Skeda %1 mungon n� direktorin� e instalimit. T� lutem korrigjo problemin ose gjej nj� kopje t� re t� programit.
+SetupFileCorrupt=Skedat e sistemimit jan� prishur. T� lutem gjej nj� kopje t� re t� programit.
+SetupFileCorruptOrWrongVer=Skedat e sistemimit jan� prishur ose nuk pajtohen me k�t� version t� Sistemimit. T� lutem korrigjo problemin ose gjej nj� kopje t� re t� programit.
+NotOnThisPlatform=Ky program nuk do veproj� n� %1.
+OnlyOnThisPlatform=Ky program duhet t� veproj� n� %1.
+OnlyOnTheseArchitectures=Ky program mund t� instalohet vet�m n� versionet e Windows-it q� jan� modeluar p�r k�to modele arkitekturore t� procesorit:%n%n%1
+MissingWOW64APIs=Versioni i Windows-it q� ke nuk p�rmban funksionet q� k�rkon Sistemimi p�r t� kryer nj� instalim 64-bit. P�r ta korrigjuar k�t� problem, t� lutem instalo Paket�n e Sh�rbimit %1.
+WinVersionTooLowError=K�tij programi i nevojitet %1 me version %2 a m� von�.
+WinVersionTooHighError=Ky program nuk mund t� instalohet n� %1 me versionin %2 a m� von�.
+AdminPrivilegesRequired=Kur e instalon k�t� program duhet t� hysh si administrator.
+PowerUserPrivilegesRequired=Kur e instalon k�t� program duhet t� hysh si administrator ose an�tar i grupit P�rdorues me Fuqi.
+SetupAppRunningError=Sistemimi diktoi se aktualisht po vepron %1.%n%nT� lutem mbylli tani t�r� rastet e tij dhe kliko OK p�r t� vijuar, ose Anulo p�r t� dal�.
+UninstallAppRunningError=�instalimi diktoi se aktualisht po vepron %1.%n%nT� lutem mbylli tani t�r� rastet e tij dhe kliko OK p�r t� vijuar, ose Anulo p�r t� dal�.
+
+; *** Misc. errors
+ErrorCreatingDir=Sistemimi nuk arrin t� krijoj� direktorin� "%1"
+ErrorTooManyFilesInDir=N� direktorin� "%1" nuk mund t� krijohen skeda sepse ka shum� t� tjera
+
+; *** Setup common messages
+ExitSetupTitle=Dalje nga Sistemimi
+ExitSetupMessage=Sistemimi nuk �sht� plot�suar. Po e mbylle, programi nuk instalohet.%n%nQ� instalimi t� plot�sohet, mund ta l�shosh Sistemimin nj� her� tjet�r.%n%nT� Mbyllet Sistemimi?
+AboutSetupMenuItem=&P�r Sistemimin...
+AboutSetupTitle=P�r Sistemimin
+AboutSetupMessage=%1 versioni %2%n%3%n%n%1 faqe zyrtare:%n%4
+AboutSetupNote=
+TranslatorNote=
+
+; *** Buttons
+ButtonBack=< &Pas
+ButtonNext=&Tjet�r >
+ButtonInstall=&Instalo
+ButtonOK=OK
+ButtonCancel=Anulo
+ButtonYes=&Po
+ButtonYesToAll=Po, &Gjith�ka
+ButtonNo=&Jo
+ButtonNoToAll=J&o, Asnj�
+ButtonFinish=&P�rfundo
+ButtonBrowse=&Shfleto...
+ButtonWizardBrowse=S&hfleto...
+ButtonNewFolder=&Krijo Dosje t� Re
+
+; *** "Select Language" dialog messages
+SelectLanguageTitle=Zgjedh Gjuh�n e Sistemimit
+SelectLanguageLabel=Zgjidhe gjuh�n e p�rdorimit gjat� instalimit:
+
+; *** Common wizard text
+ClickNext=Kliko Tjet�r p�r t� vijuar, ose Anulo q� Sistemimi t� mbyllet.
+BeveledLabel=
+BrowseDialogTitle=Shfleton dosjen
+BrowseDialogLabel=Zgjidhe nj� dosje n� k�t� list�, pastaj kliko OK.
+NewFolderName=Dosje e re
+
+; *** "Welcome" wizard page
+WelcomeLabel1=Mir� se erdhe te Udh�rr�fyesi p�r Sistemimin e [name]
+WelcomeLabel2=[name/ver] do instalohet tani n� kompjuter.%n%nPara se t� vijosh, rekomandohet t� mbyllen aplikimet e tjera.
+
+; *** "Password" wizard page
+WizardPassword=Fjal�kalimi
+PasswordLabel1=Ky instalim �sht� i mbrojtur me fjal�kalim.
+PasswordLabel3=T� lutem shkruaj fjal�kalimin, pastaj kliko Tjet�r q� t� vijosh. Fjal�kalimi duhet v�n� me kujdes.
+PasswordEditLabel=&Fjal�kalimi:
+IncorrectPassword=Fjal�kalimi i shkruar nuk �sht� i sakt�. T� lutem provoje p�rs�ri.
+
+; *** "License Agreement" wizard page
+WizardLicense=Marr�veshja e Licenc�s
+LicenseLabel=T� lutem lexo informacionin e r�nd�sish�m m� posht� para se t� vijosh.
+LicenseLabel3=T� lutem lexo Marr�veshjen e Licenc�s m� posht�. Para se t� vijosh me instalimin, duhet t� pranosh detyrimet e k�saj marr�veshjeje.
+LicenseAccepted=&Pranoj marr�veshjen
+LicenseNotAccepted=&Nuk e pranoj marr�veshjen
+
+; *** "Information" wizard pages
+WizardInfoBefore=Informacion
+InfoBeforeLabel=T� lutem lexo informacionin e r�nd�sish�m m� posht� para se t� vijosh.
+InfoBeforeClickLabel=Kur t� jesh gati p�r t� vijuar me Sistemimin, kliko Tjet�r.
+WizardInfoAfter=Informacion
+InfoAfterLabel=T� lutem lexo informacionin e r�nd�sish�m m� posht� para se t� vijosh.
+InfoAfterClickLabel=Kur t� jesh gati p�r t� vijuar me Sistemimin, kliko Tjet�r.
+
+; *** "User Information" wizard page
+WizardUserInfo=Informacion i P�rdoruesit
+UserInfoDesc=T� lutem vendos informacionin t�nd.
+UserInfoName=&P�rdoruesi:
+UserInfoOrg=&Organizata:
+UserInfoSerial=&Numri i Seris�:
+UserInfoNameRequired=Duhet shkruar nj� em�r.
+
+; *** "Select Destination Location" wizard page
+WizardSelectDir=Zgjedh Destinacionin
+SelectDirDesc=Ku duhet t� instalohet [name]?
+SelectDirLabel3=Sistemimi do e instaloj� [name] n� k�t� dosje.
+SelectDirBrowseLabel=P�r t� vijuar, kliko Tjet�r. N�se do t� zgjedh�sh nj� dosje ndryshe, kliko Shfleto.
+DiskSpaceMBLabel=K�rkon jo m� pak se [mb] MB hap�sir� t� lir� n� disk.
+ToUNCPathname=Sistemimi nuk mund t� instaloj� n� nj� shteg UNC. N�se po provon instalimin n� rrjet, duhet t� lokalizosh drajvin e rrjetit.
+InvalidPath=Duhet t� shkruhet shtegu i plot� me shkronj�n e drajvit; p�r shembull:%n%nC:\APP%n%nose shtegu UNC n� form�n:%n%n\\server\share
+InvalidDrive=Drajvi ose shp�rndar�si UNC i zgjedhur nuk ekziston ose nuk hapet. T� lutem zgjidhe nj� tjet�r.
+DiskSpaceWarningTitle=Hap�sir� e Pamjaftueshme
+DiskSpaceWarning=Sistemimi k�rkon t� pakt�n %1 KB hap�sir� t� lir� p�r t� instaluar, por ky drajv ka vet�m %2 KB me vler�.%n%nGjithsesi, do vijosh?
+DirNameTooLong=Emri ose shtegu i dosjes �sht� tep�r i gjat�.
+InvalidDirName=Emri i dosjes nuk ka vler�.
+BadDirName32=Emri i dosjes nuk mund t� p�rmbaj� k�to shkronja:%n%n%1
+DirExistsTitle=Dosje Ekzistuese
+DirExists=Dosja:%n%n%1%n%nekziston q� m� par�. Gjithsesi, t� instalohet n� k�t� dosje?
+DirDoesntExistTitle=Dosje Joekzistuese
+DirDoesntExist=Dosja:%n%n%1%n%nnuk ekziston. T� krijohet kjo dosje?
+
+; *** "Select Components" wizard page
+WizardSelectComponents=Zgjedh P�rb�r�sit
+SelectComponentsDesc=Cil�t p�rb�r�s t� instalohen?
+SelectComponentsLabel2=Zgjidhi p�rb�r�sit q� do t� instalosh; mos i sh�no p�rb�r�sit q� nuk do t� instalosh. Kliko Tjet�r kur t� jesh gati p�r t� vijuar.
+FullInstallation=Instalim i Plot�
+; if possible don't translate 'Compact' as 'Minimal' (I mean 'Minimal' in your language)
+CompactInstallation=Instalim i Pak�t
+CustomInstallation=Instalim i Porositur
+NoUninstallWarningTitle=P�rb�r�s Ekzistues
+NoUninstallWarning=Sistemimi diktoi se k�ta p�rb�r�s jan� tashm� t� instaluar n� kompjuter:%n%n%1%n%nMoszgjedhja e k�tyre p�rb�r�sve nuk do i �instaloj� ata.%n%nGjithsesi, do vijosh?
+ComponentSize1=%1 KB
+ComponentSize2=%1 MB
+ComponentsDiskSpaceMBLabel=Kjo zgjedhje k�rkon jo m� pak se [mb] MB hap�sir� t� lir� n� disk.
+
+; *** "Select Additional Tasks" wizard page
+WizardSelectTasks=Zgjedh Detyrat Shtes�
+SelectTasksDesc=Cilat detyra shtes� t� kryhen?
+SelectTasksLabel2=Zgjidhi detyrat shtes� q� duhet t� kryej� Sistemimi gjat� instalimit t� [name], pastaj kliko Tjet�r.
+
+; *** "Select Start Menu Folder" wizard page
+WizardSelectProgramGroup=Zgjedh Dosjen n� Menyn� Nis
+SelectStartMenuFolderDesc=Ku duhet t'i vendos� Sistemimi shkurtoret e programit?
+SelectStartMenuFolderLabel3=Sistemimi do i krijoj� shkurtoret e programit n� k�t� dosje t� Menys� Nis.
+SelectStartMenuFolderBrowseLabel=P�r t� vijuar, kliko Tjet�r. N�se do t� zgjedh�sh nj� dosje ndryshe, kliko Shfleto.
+MustEnterGroupName=Duhet shkruar emri i dosjes.
+GroupNameTooLong=Emri ose shtegu i dosjes �sht� tep�r i gjat�.
+InvalidGroupName=Emri i dosjes nuk ka vler�.
+BadGroupName=Emri i dosjes nuk duhet t� p�rmbaj� asnj� nga k�to shkronja:%n%n%1
+NoProgramGroupCheck2=&Mos krijo dosje n� Menyn� Nis
+
+; *** "Ready to Install" wizard page
+WizardReady=Gati t� Instalohet
+ReadyLabel1=Sistemimi �sht� gati t� nis� instalimin e [name] n� kompjuter.
+ReadyLabel2a=Kliko Instalo p�r t� vijuar me instalimin, ose kliko Pas p�r t� rishikuar apo ndryshuar ndonj� vendosje.
+ReadyLabel2b=Kliko Instalo p�r t� vijuar me instalimin.
+ReadyMemoUserInfo=Informacioni i p�rdoruesit:
+ReadyMemoDir=Destinacioni:
+ReadyMemoType=Lloji i sistemimit:
+ReadyMemoComponents=P�rb�r�sit e zgjedhur:
+ReadyMemoGroup=Dosja n� Menyn� Nis:
+ReadyMemoTasks=Detyra shtes�:
+
+; *** "Preparing to Install" wizard page
+WizardPreparing=Gati t� Instalohet
+PreparingDesc=Sistemimi �sht� gati t� instaloj� [name] n� kompjuter.
+PreviousInstallNotCompleted=Nuk plot�sohet instalimi/heqja e programit t� m�parsh�m. Kompjuteri duhet t� rinis� q� t� plot�sohet instalimi.%n%nPasi kompjuteri t� riniset, vepro p�rs�ri Sistemimin q� t� plot�sohet instalimi i [name].
+CannotContinue=Sistemimi nuk mund t� vijoj�. T� lutem kliko Anulo p�r t� dal�.
+
+; *** "Installing" wizard page
+WizardInstalling=Instalim
+InstallingLabel=T� lutem prit q� Sistemimi t� instaloj� [name] n� kompjuter.
+
+; *** "Setup Completed" wizard page
+FinishedHeadingLabel=Plot�son Udh�rr�fyesin p�r Sistemimin e [name]
+FinishedLabelNoIcons=Sistemimi p�rfundon instalimin n� kompjuter t� [name].
+FinishedLabel=Sistemimi p�rfundon instalimin n� kompjuter t� [name]. Aplikimi mund t� l�shohet duke zgjedhur ikon�n e instaluar.
+ClickFinish=Kliko P�rfundo p�r t� dal� nga Sistemimi.
+FinishedRestartLabel=Q� t� p�rfundoj� instalimi i [name], Sistemimi duhet t� rinis� kompjuterin. T� rinis� tani?
+FinishedRestartMessage=Q� t� p�rfundoj� instalimi i [name], Sistemimi duhet t� rinis� kompjuterin.%n%nT� rinis� tani?
+ShowReadmeCheck=Po, dua t� shikoj sked�n README
+YesRadio=&Po, rinis kompjuterin tani
+NoRadio=&Jo, do rinis kompjuterin m� von�
+; used for example as 'Run MyProg.exe'
+RunEntryExec=L�sho %1
+; used for example as 'View Readme.txt'
+RunEntryShellExec=Shiko %1
+
+; *** "Setup Needs the Next Disk" stuff
+ChangeDiskTitle=Sistemimi K�rkon Diskun Tjet�r
+SelectDiskLabel2=T� lutem vendos Diskun %1 dhe kliko OK.%n%nN�se skedat n� k�t� disk mund t� ndodhen n� nj� dosje ndryshe nga ajo e shfaqur k�tu, vendos shtegun e sakt� ose kliko Shfleto.
+PathLabel=&Shtegu:
+FileNotInDir2=Skeda "%1" nuk ndodhet n� "%2". T� lutem vendos diskun e sakt� ose zgjidhe nj� dosje tjet�r.
+SelectDirectoryLabel=T� lutem p�rcakto vendin e diskut tjet�r.
+
+; *** Installation phase messages
+SetupAborted=Nuk plot�sohet sistemimi.%n%nT� lutem korrigjo problemin dhe l�shoje at� p�rs�ri.
+EntryAbortRetryIgnore=Kliko Riprovo p�r t� provuar p�rs�ri, P�rbuz p�r t� vijuar gjithsesi, ose Nd�rprit q� instalimi t� anulohet.
+
+; *** Installation status messages
+StatusCreateDirs=Krijon direktorit�...
+StatusExtractFiles=Nxjerr skedat...
+StatusCreateIcons=Krijon shkurtoret...
+StatusCreateIniEntries=Krijon hyrjet INI...
+StatusCreateRegistryEntries=Krijon hyrjet n� regjist�r...
+StatusRegisterFiles=Regjistron skedat...
+StatusSavingUninstall=Ruan informacionin e �instalimit...
+StatusRunProgram=P�rfundon instalimin...
+StatusRollback=Kthen ndryshimin...
+
+; *** Misc. errors
+ErrorInternal2=Gabim i brendsh�m: %1
+ErrorFunctionFailedNoCode=%1 ndalon
+ErrorFunctionFailed=%1 ndalon; kodi %2
+ErrorFunctionFailedWithMessage=%1 ndalon; kodi %2.%n%3
+ErrorExecutingProgram=Kjo sked� nuk ekzekutohet:%n%1
+
+; *** Registry errors
+ErrorRegOpenKey=Gabim n� hapjen e kodit t� regjistrit:%n%1\%2
+ErrorRegCreateKey=Gabim n� krijimin e kodit t� regjistrit:%n%1\%2
+ErrorRegWriteKey=Gabim n� shkrimin e kodit t� regjistrit:%n%1\%2
+
+; *** INI errors
+ErrorIniEntry=Gabim n� krijimin e hyrjes INI te skeda "%1".
+
+; *** File copying errors
+FileAbortRetryIgnore=Kliko Riprovo p�r t� provuar p�rs�ri, P�rbuz p�r ta kaluar k�t� sked� (nuk rekomandohet), ose Nd�rprit q� instalimi t� anulohet.
+FileAbortRetryIgnore2=Kliko Riprovo p�r t� provuar p�rs�ri, P�rbuz p�r t� vijuar gjithsesi (nuk rekomandohet), ose Nd�rprit q� instalimi t� anulohet.
+SourceIsCorrupted=�sht� prishur skeda e burimit
+SourceDoesntExist=Nuk ekziston skeda e burimit "%1"
+ExistingFileReadOnly=Skeda ekzistuese �sht� sh�nuar vet�m p�r lexim.%n%nKliko Riprovo p�r t� hequr atributin e leximit dhe provoje p�rs�ri, P�rbuz p�r ta kaluar k�t� sked�, ose Nd�rprit q� �instalimi t� anulohet.
+ErrorReadingExistingDest=Ndodhi nj� gabim gjat� prov�s p�r t� lexuar sked�n ekzistuese:
+FileExists=Skeda ekziston q� m� par�.%n%nTa mbishkruaj� Sistemimi at�?
+ExistingFileNewer=Skeda ekzistuese �sht� me e re sesa ajo q� Sistemimi provon t� instaloj�. Rekomandohet q� t� mbash sked�n ekzistuese.%n%nDo mbash sked�n ekzistuese?
+ErrorChangingAttr=Ndodhi nj� gabim gjat� prov�s p�r t� ndryshuar atributet e sked�s ekzistuese:
+ErrorCreatingTemp=Ndodhi nj� gabim gjat� prov�s p�r t� krijuar nj� sked� n� direktorin� e destinacionit:
+ErrorReadingSource=Ndodhi nj� gabim gjat� prov�s p�r t� lexuar sked�n burim:
+ErrorCopying=Ndodhi nj� gabim gjat� orvatjes p�r t� kopjuar nj� sked�:
+ErrorReplacingExistingFile=Ndodhi nj� gabim gjat� orvatjes p�r t� z�vend�suar sked�n ekzistuese:
+ErrorRestartReplace=Ndalon RestartReplace:
+ErrorRenamingTemp=Ndodhi nj� gabim gjat� riem�rtimit t� sked�s n� direktorin� e destinacionit:
+ErrorRegisterServer=Nuk mund t� regjistrohet DLL/OCX: %1
+ErrorRegSvr32Failed=RegSvr32 ndalon me kodin e daljes %1
+ErrorRegisterTypeLib=Nuk mund t� regjistrohet lloji i libraris�: %1
+
+; *** Post-installation errors
+ErrorOpeningReadme=Ndodhi nj� gabim gjat� hapjes s� sked�s README.
+ErrorRestartingComputer=Sistemimi nuk arriti t� rinis� kompjuterin. T� lutem b�je vet�.
+
+; *** Uninstaller messages
+UninstallNotFound=Skeda "%1" nuk ekziston. Nuk mund t� �instalohet.
+UninstallOpenError=Skeda "%1" nuk mund t� hapet. Nuk mund t� �instalohet.
+UninstallUnsupportedVer=Ditari i �instalimit "%1" ka nj� format q� nuk njihet nga ky version i �instaluesit. Nuk mund t� �instalohet
+UninstallUnknownEntry=Te ditari i �instalimit v�rehet nj� hyrje e panjohur (%1)
+ConfirmUninstall=Je i sigurt p�r fshirjen e plot� t� %1 dhe t�r� p�rb�r�sit e vet?
+UninstallOnlyOnWin64=Ky instalim mund t� �instalohet vet�m n� Windows 64-bit.
+OnlyAdminCanUninstall=Ky instalim mund t� �instalohet vet�m nga nj� p�rdorues me privilegje administrimi.
+UninstallStatusLabel=T� lutem prit nd�rkoh� q� %1 fshihet nga kompjuteri.
+UninstalledAll=%1 u fshi me sukses nga kompjuteri.
+UninstalledMost=P�rfundon �instalimi i %1.%n%nDisa elemente nuk mund t� fshiheshin. K�to mund t'i fshish vet�.
+UninstalledAndNeedsRestart=Q� t� plot�sohet �instalimi i %1, kompjuteri duhet t� riniset.%n%nT� rinis� tani?
+UninstallDataCorrupted="%1" �sht� sked� e prishur. Nuk mund t� �instalohet.
+
+; *** Uninstallation phase messages
+ConfirmDeleteSharedFileTitle=Fshin Sked�n e Ndar�?
+ConfirmDeleteSharedFile2=Sistemimi tregon se kjo sked� e ndar� nuk p�rdoret m� nga asnj� program. Ta fshij� �instalimi k�t� sked� t� ndar�?%n%nN�se ndonj� program e p�rdor akoma sked�n, kur ajo t� fshihet programi mund t� mos punoj� si� duhet. N�se nuk je i sigurt, zgjidhe Jo. L�nia e sked�s n� sistem nuk do shkaktoj� d�me.
+SharedFileNameLabel=Emri i sked�s:
+SharedFileLocationLabel=Vendi:
+WizardUninstalling=Statusi i �instalimit
+StatusUninstalling=�instalon %1...
+
+; The custom messages below aren't used by Setup itself, but if you make
+; use of them in your scripts, you'll want to translate them.
+
+[CustomMessages]
+
+NameAndVersion=%1 versioni %2
+AdditionalIcons=Ikona shtes�:
+CreateDesktopIcon=Krijo nj� ikon� n� &tryez�
+CreateQuickLaunchIcon=Krijo nj� ikon� n� &Quick Launch
+ProgramOnTheWeb=%1 n� Rrjet�
+UninstallProgram=�instalo %1
+LaunchProgram=L�sho %1
+AssocFileExtension=&Shoq�ro %1 me sigl�n e sked�s %2
+AssocingFileExtension=%1 shoq�rohet me sigl�n e sked�s %2...
diff --git a/translation/inno/Estonian.isl b/translation/inno/Estonian.isl
new file mode 100644
index 0000000..003275f
--- /dev/null
+++ b/translation/inno/Estonian.isl
@@ -0,0 +1,341 @@
+; *** Inno Setup version 5.5.3+ Estonian messages ***
+;
+; Estonian translation by LiivaneLord
+; E-mail: liivane.lord at mail.ee
+; Last modification date: 2013-01-09
+; T�lge baseerub rix'i t�lkele, mida on parandatud ja kohandatud uuemale versioonile.
+;
+; To download user-contributed translations of this file, go to:
+; http://www.jrsoftware.org/files/istrans/
+;
+; Note: When translating this text, do not add periods (.) to the end of
+; messages that didn't have them already, because on those messages Inno
+; Setup adds the periods automatically (appending a period would result in
+; two periods being displayed).
+
+[LangOptions]
+; The following three entries are very important. Be sure to read and
+; understand the '[LangOptions] section' topic in the help file.
+LanguageName=Eesti
+LanguageID=$0425
+LanguageCodePage=1257
+; If the language you are translating to requires special font faces or
+; sizes, uncomment any of the following entries and change them accordingly.
+;DialogFontName=
+;DialogFontSize=8
+;WelcomeFontName=Verdana
+;WelcomeFontSize=12
+;TitleFontName=Arial
+;TitleFontSize=29
+;CopyrightFontName=Arial
+;CopyrightFontSize=8
+
+[Messages]
+
+; *** Application titles
+SetupAppTitle=Paigalda
+SetupWindowTitle=Paigalda %1
+UninstallAppTitle=Eemalda
+UninstallAppFullTitle=Eemalda %1
+
+; *** Misc. common
+InformationTitle=Informatsioon
+ConfirmTitle=Kinnita
+ErrorTitle=Viga
+
+; *** SetupLdr messages
+SetupLdrStartupMessage=Paigaldatakse %1. Kas soovid j�tkata?
+LdrCannotCreateTemp=Ei saanud luua ajutist faili. Paigaldamine katkestati
+LdrCannotExecTemp=Ei saanud k�ivitada faili ajutises kataloogis. Paigaldamine katkestati
+
+; *** Startup error messages
+LastErrorMessage=%1.%n%nViga %2: %3
+SetupFileMissing=%1 on paigaldamise kaustast kadunud. Palun paranda see viga v�i hangi programmi uus koopia.
+SetupFileCorrupt=Paigaldaja failid on rikutud. Palun hangi programmi uus koopia.
+SetupFileCorruptOrWrongVer=Paigaldaja failid on kas rikutud v�i ei t��ta selle paigaldaja versiooniga. Palun paranda see viga v�i hangi programmi uus koopia.
+InvalidParameter=K�sureale anti vale parameeter:%n%n%1
+SetupAlreadyRunning=Paigaldaja alles t��tab.
+WindowsVersionNotSupported=Seda programmi ei saa selle Windowsi versiooniga kasutada, mis arvutis praegu t��tab.
+WindowsServicePackRequired=See programm vajab %1 Service Pack (Hoolduspakett) %2 v�i uuemat.
+NotOnThisPlatform=See programm ei t��ta %1'i platvormil.
+OnlyOnThisPlatform=See programm peab t��tama %1'i platvormil.
+OnlyOnTheseArchitectures=Seda programmi saab paigaldada ainult neile Windowsi versioonidele, mis on v�lja t��tatud j�rgmistele protsessori arhitektuuridele:%n%n%1
+MissingWOW64APIs=Sinu arvutis t��taval Windowsil puuduvad 64-bitise paigaldamise jaoks vajalik funktsionaalsus. Selle probleemi parandamiseks paigalda palun Service Pack (Hoolduspakett) %1.
+WinVersionTooLowError=See programm vajab %1 versiooniga %2 v�i uuemat.
+WinVersionTooHighError=Seda programmi ei saa paigaldada %1 versiooniga %2 v�i uuema puhul.
+AdminPrivilegesRequired=Selle programmi paigaldamiseks pead olema administraatorina sisse logitud.
+PowerUserPrivilegesRequired=Selle programmi paigaldamiseks pead olema sisse logitud administraatorina v�i Power user liikmena.
+SetupAppRunningError=Paigaldaja tuvastas, et %1 t��tab hetkel.%n%nPalun sulge see programm ning seej�rel j�tkamiseks vajuta OK, katkestamiseks Katkesta.
+UninstallAppRunningError=Eemaldaja tuvastas, et %1 t��tab hetkel.%n%nPalun sulge see programm ning seej�rel j�tkamiseks vajuta OK, katkestamiseks Katkesta.
+
+; *** Misc. errors
+ErrorCreatingDir=Paigaldaja ei saanud luua kataloogi "%1"
+ErrorTooManyFilesInDir=Ei saanud luua faili kataloogi "%1", kuna seal on juba liiga palju faile
+
+; *** Setup common messages
+ExitSetupTitle=V�lju paigaldajast
+ExitSetupMessage=Paigaldamine pole valmis. Kui praegu v�ljud, siis programmi ei paigaldata.%n%nPaigaldamise l�petamiseks v�id paigaldaja m�ni teine kord uuesti k�ivitada.%n%nSoovid v�ljuda paigaldajast?
+AboutSetupMenuItem=&Teave paigaldajast...
+AboutSetupTitle=Teave paigaldajast
+AboutSetupMessage=%1 versiooniga %2%n%3%n%n%1 koduleht:%n%4
+AboutSetupNote=
+TranslatorNote=T�lkis LiivaneLord (liivane[dot]lord[at]mail[dot]ee)
+
+; *** Buttons
+ButtonBack=< &Tagasi
+ButtonNext=&Edasi >
+ButtonInstall=&Paigalda
+ButtonOK=OK
+ButtonCancel=Katkesta
+ButtonYes=&Jah
+ButtonYesToAll=K�ikidele J&ah
+ButtonNo=&Ei
+ButtonNoToAll=K�ikidele E&i
+ButtonFinish=&Valmis
+ButtonBrowse=&Sirvi...
+ButtonWizardBrowse=S&irvi...
+ButtonNewFolder=&Loo uus kaust
+
+; *** "Select Language" dialog messages
+SelectLanguageTitle=Vali paigaldaja keel
+SelectLanguageLabel=Vali keel, mida soovid kasutada paigaldamise k�igus:
+
+; *** Common wizard text
+ClickNext=J�tkamiseks vajuta Edasi, paigaldajast v�ljumiseks vajuta Katkesta.
+BeveledLabel=
+BrowseDialogTitle=Sirvi kausta
+BrowseDialogLabel=Vali allolevast nimekirjast kaust ja vajuta OK.
+NewFolderName=Uus kaust
+
+; *** "Welcome" wizard page
+WelcomeLabel1=Tere tulemast [name] paigaldaja viisardisse
+WelcomeLabel2=Sinu arvutisse paigaldatakse [name/ver].%n%nEnne j�tkamist on soovitatav sulgeda k�ik muud programmid.
+
+; *** "Password" wizard page
+WizardPassword=Parool
+PasswordLabel1=See paigaldaja on kaitstud parooliga.
+PasswordLabel3=Palun sisesta parool ja vajuta Edasi. Paroolid on t�stutundlikud.
+PasswordEditLabel=&Parool:
+IncorrectPassword=Sisestatud parool on vale. Palun proovi uuesti.
+
+; *** "License Agreement" wizard page
+WizardLicense=Litsentsileping
+LicenseLabel=Palun loe enne j�tkamist see informatsioon l�bi.
+LicenseLabel3=Palun loe j�rgnevat litsentsilepingut. Paigaldamise j�tkamiseks pead n�ustuma selle lepingu tingimustega.
+LicenseAccepted=Ma &n�ustun lepinguga
+LicenseNotAccepted=Ma &ei n�ustu lepinguga
+
+; *** "Information" wizard pages
+WizardInfoBefore=Informatsioon
+InfoBeforeLabel=Palun loe enne j�tkamist see oluline informatsioon l�bi.
+InfoBeforeClickLabel=Kui oled valmis j�tkama paigaldamist, vajuta Edasi.
+WizardInfoAfter=Informatsioon
+InfoAfterLabel=Palun loe enne j�tkamist see oluline informatsioon l�bi.
+InfoAfterClickLabel=Kui oled valmis j�tkama paigaldamist, vajuta Edasi.
+
+; *** "User Information" wizard page
+WizardUserInfo=Andmed kasutaja kohta
+UserInfoDesc=Palun sisesta oma andmed.
+UserInfoName=&Kasutaja nimi:
+UserInfoOrg=&Organisatsioon:
+UserInfoSerial=&Seerianumber:
+UserInfoNameRequired=Pead sisestama nime.
+
+; *** "Select Destination Location" wizard page
+WizardSelectDir=Vali programmile kaust
+SelectDirDesc=Kuhu [name] paigaldada?
+SelectDirLabel3=Paigaldaja paigaldab [name]'i j�rgnevasse kausta.
+SelectDirBrowseLabel=J�tkamiseks vajuta Edasi. Kui soovid valida muu kausta, vajuta Sirvi.
+DiskSpaceMBLabel=Programm vajab v�hemalt [mb] MB vaba ruumi.
+CannotInstallToNetworkDrive=Programmi ei saa paigaldada v�rgudraivile.
+CannotInstallToUNCPath=Programmi ei saa paigaldada UNC kataloogi.
+InvalidPath=Pead sisestama t�ispika draivitee koos draivit�hisega; n�iteks:%n%nC:\APP%n%nv�i UNC kataloog kujul:%n%n\\server\share
+InvalidDrive=Sinu valitud draivi v�i UNC kataloogi ei eksisteeri v�i puudub sellele ligip��s. Palun vali m�ni teine.
+DiskSpaceWarningTitle=Pole piisavalt ruumi
+DiskSpaceWarning=Paigaldamiseks on vaja v�hemalt %1 KB vaba ruumi, aga valitud draivil on vaba ainult %2 KB.%n%nKas soovid sellegipoolest j�tkata?
+DirNameTooLong=Kausta nimi v�i kaustatee on liiga pikk
+InvalidDirName=Kausta nimi on vale.
+BadDirName32=Kausta nimed ei tohi sisaldada �htegi j�rgnevatest s�mbolitest:%n%n%1
+DirExistsTitle=Kaust on olemas
+DirExists=Kaust:%n%n%1%n%non juba olemas. Kas soovid sellegipoolest sinna paigaldada?
+DirDoesntExistTitle=Kaust puudub
+DirDoesntExist=Kaust:%n%n%1%n%npuudub. Kas soovid, et see kaust luuakse?
+
+; *** "Select Components" wizard page
+WizardSelectComponents=Vali komponendid
+SelectComponentsDesc=Millised komponendid paigaldada?
+SelectComponentsLabel2=Vali komponendid, mida paigaldada; eemalda m�rgid komponentidelt, mida ei soovi paigaldada. Kui oled valmis j�tkama, vajuta Edasi.
+FullInstallation=T�ielik paigaldamine
+; if possible don't translate 'Compact' as 'Minimal' (I mean 'Minimal' in your language)
+CompactInstallation=Kompaktne paigaldamine
+CustomInstallation=Kohandatud paigaldamine
+NoUninstallWarningTitle=Komponendid on juba olemas
+NoUninstallWarning=Paigaldaja tuvastas, et j�rgnevad komponendid on sinu arvutis juba olemas:%n%n%1%n%nNende mittevalimine ei eemalda neid.%n%nKas soovid sellegipoolest j�tkata?
+ComponentSize1=%1 KB
+ComponentSize2=%1 MB
+ComponentsDiskSpaceMBLabel=Praegune valik vajab v�hemalt [mb] MB vaba ruumi.
+
+; *** "Select Additional Tasks" wizard page
+WizardSelectTasks=Vali t�iendavad �lesanded
+SelectTasksDesc=Milliseid t�iendavaid �lesanded t�ita?
+SelectTasksLabel2=Vali, milliseid t�iendavaid �lesandeid [name] paigaldaja peab t�itma ja vajuta Edasi.
+
+; *** "Select Start Menu Folder" wizard page
+WizardSelectProgramGroup=Vali Start men�� kaust
+SelectStartMenuFolderDesc=Kuhu luua programmi otseteed?
+SelectStartMenuFolderLabel3=Paigaldaja loob programmi otseteed j�rgnevasse Start men�� kausta.
+SelectStartMenuFolderBrowseLabel=J�tkamiseks vajuta Edasi. Kui soovid valida muu kausta, vajuta Sirvi.
+MustEnterGroupName=Pead sisestama kausta nime.
+GroupNameTooLong=Kausta nimi v�i kaustatee on liiga pikk.
+InvalidGroupName=Kausta nimi on vale.
+BadGroupName=Kausta nimi ei tohi sisaldada j�rgnevatest s�mbolitest:%n%n%1
+NoProgramGroupCheck2=&�ra loo Start men�� kausta
+
+; *** "Ready to Install" wizard page
+WizardReady=Valmis paigaldama
+ReadyLabel1=Paigaldaja on valmis paigaldama [name]'i sinu arvutisse.
+ReadyLabel2a=Paigaldamise j�tkamiseks vajuta Paigalda v�i vajuta Tagasi, et n�ha v�i muuta seadeid.
+ReadyLabel2b=Paigaldamise j�tkamiseks vajuta Paigalda.
+ReadyMemoUserInfo=Kasutaja andmed:
+ReadyMemoDir=Sihtkaust:
+ReadyMemoType=Paigalduse t��p:
+ReadyMemoComponents=Valitud komponendid:
+ReadyMemoGroup=Start men�� kaust:
+ReadyMemoTasks=Lisa�lesanded:
+
+; *** "Preparing to Install" wizard page
+WizardPreparing=Paigaldamiseks valmistumine
+PreparingDesc=Paigaldaja valmistub paigaldama [name]'i sinu arvutisse.
+PreviousInstallNotCompleted=Eelmise programmi paigaldamine/eemaldamine ei ole l�petatud. Paigaldamise l�petamiseks pead arvuti taask�ivitama.%n%nP�rast taask�ivitust k�ivitage [name]'i paigaldaja uuesti, et l�petada paigaldamine.
+CannotContinue=Paigaldaja ei saa j�tkata. V�ljumiseks vajuta palun Katkesta.
+ApplicationsFound=J�rgnevad rakendused kasutavad faile, mida paigaldaja peab uuendama. Soovitatav on lubada paigaldajal need rakendused automaatselt sulgeda.
+ApplicationsFound2=J�rgnevad rakendused kasutavad faile, mida paigaldaja peab uuendama. Soovitatav on lubada paigaldajal need rakendused automaatselt sulgeda. P�rasta paigaldamise l�petamist �ritab paigaldaja need rakendused taask�ivitada.
+CloseApplications=&Sulge rakendused automaatselt
+DontCloseApplications=�ra s&ulge rakendusi
+ErrorCloseApplications=Paigaldaja ei saanud k�iki rakendusi automaatselt sulgeda. Enne j�tkamist on soovitatav sul sulgeda k�ik rakendused, mis kasutavad faile, mida paigaldaja peab uuendama.
+
+; *** "Installing" wizard page
+WizardInstalling=Paigaldamine
+InstallingLabel=Palun oota, kuni [name] paigaldatakse sinu arvutisse.
+
+; *** "Setup Completed" wizard page
+FinishedHeadingLabel=[name]'i paigaldamise l�petamine
+FinishedLabelNoIcons=[name]'i paigaldamine on l�petatud.
+FinishedLabel=[name]'i paigaldamine on l�petatud. Programmi saab k�ivitada paigaldatud ikoonide abil.
+ClickFinish=Paigaldajast v�ljumiseks vajuta Valmis.
+FinishedRestartLabel=[name]'i paigaldamise l�petamiseks peab arvuti taask�ivituma. Kas soovid kohe taask�ivitada?
+FinishedRestartMessage=[name]'i paigaldamise l�petamiseks peab arvuti taask�ivituma.%n%nKas soovid kohe taask�ivitada?
+ShowReadmeCheck=Jah, sooviksin n�ha Readme (LoeMind) faili
+YesRadio=&Jah, taask�ivita arvuti kohe
+NoRadio=&Ei, taask�ivitan arvuti hiljem
+; used for example as 'Run MyProg.exe'
+RunEntryExec=K�ivita %1
+; used for example as 'View Readme.txt'
+RunEntryShellExec=Vaata %1
+
+; *** "Setup Needs the Next Disk" stuff
+ChangeDiskTitle=Paigaldaja vajab j�rgmist diski
+SelectDiskLabel2=Palun sisesta disk %1 ja vajuta OK.%n%nKui diskil olevad failid asuvad kuskil mujal, siis sisesta �ige kaustatee v�i vajuta Sirvi.
+PathLabel=&Asukoht:
+FileNotInDir2=Fail "%1" ei asu kohas "%2". Palun sisesta �ige disk v�i vali teine kaust.
+SelectDirectoryLabel=Palun t�psusta j�rgmise diski asukoht.
+
+; *** Installation phase messages
+SetupAborted=Paigaldamist ei l�petatud.%n%nPalun paranda viga ja k�ivita paigaldaja uuesti.
+EntryAbortRetryIgnore=Uuesti proovimiseks vajuta Proovi uuesti, j�tkamiseks Ignoreeri v�i l�petamiseks Katkesta.
+
+; *** Installation status messages
+StatusClosingApplications=Rakenduste sulgemine...
+StatusCreateDirs=Kaustade loomine...
+StatusExtractFiles=Failide lahtipakkimine...
+StatusCreateIcons=Otseteede loomine...
+StatusCreateIniEntries=INI kirjete loomine...
+StatusCreateRegistryEntries=Registri kirjete loomine...
+StatusRegisterFiles=Failide registreerimine...
+StatusSavingUninstall=Eemaldamise teabe salvestamine...
+StatusRunProgram=Paigaldamise l�petamine...
+StatusRestartingApplications=Rakenduste taask�ivitamine...
+StatusRollback=Muudatuste tagasiv�tmine...
+
+; *** Misc. errors
+ErrorInternal2=Sisemine viga: %1
+ErrorFunctionFailedNoCode=%1 luhtus
+ErrorFunctionFailed=%1 luhtus; kood %2
+ErrorFunctionFailedWithMessage=%1 luhtus; kood %2.%n%3
+ErrorExecutingProgram=Ei saanud k�ivitada faili:%n%1
+
+; *** Registry errors
+ErrorRegOpenKey=Ei saanud avada registri v�tit:%n%1\%2
+ErrorRegCreateKey=Ei saanud luua registri v�tit:%n%1\%2
+ErrorRegWriteKey=Ei saanud kirjutada registri v�tit:%n%1\%2
+
+; *** INI errors
+ErrorIniEntry=Viga INI kirje loomisel failis "%1".
+
+; *** File copying errors
+FileAbortRetryIgnore=Uuesti proovimiseks vajuta Proovi uuesti, faili vahelej�tmiseks Ignoreeri (mittesoovitatav) v�i paigaldamisest loobumiseks Katkesta.
+FileAbortRetryIgnore2=Uuesti proovimiseks vajuta Proovi uuesti, j�tkamiseks Ignoreeri (mittesoovitatav) v�i paigaldamisest loobumiseks Katkesta.
+SourceIsCorrupted=L�htefail on rikutud
+SourceDoesntExist=L�htefaili "%1" ei eksisteeri
+ExistingFileReadOnly=Fail on m�rgitud kui kirjutuskaitstud.%n%nKirjutuskaitstuse mahav�tmiseks vajuta Proovi uuesti ja proovi uuesti, faili vahelej�tmiseks Ignoreeri v�i paigaldamisest loobumiseks Katkesta.
+ErrorReadingExistingDest=Faili lugemisel ilmnes viga:
+FileExists=Fail on juba olemas.%n%nKas soovid, et paigaldaja selle �le kirjutaks?
+ExistingFileNewer=Olemasolev fail on uuem kui see, mida paigaldaja �ritab paigaldada. Soovitatav on olemasolev fail alles j�tta.%n%nKas soovid olemasoleva faili alles j�tta?
+ErrorChangingAttr=Faili atribuutide muutmisel ilmnes viga:
+ErrorCreatingTemp=Faili loomisel sihtkataloogi ilmnes viga:
+ErrorReadingSource=L�htefaili lugemisel ilmnes viga:
+ErrorCopying=Faili kopeerimisel ilmnes viga:
+ErrorReplacingExistingFile=Olemasoleva faili asendamisel ilmnes viga:
+ErrorRestartReplace=Faili asendamine peale taask�ivitust ei �nnestunud:
+ErrorRenamingTemp=Faili nime muutmisel sihtkataloogis ilmnes viga:
+ErrorRegisterServer=Ei saanud registreerida DLL/OCX: %1
+ErrorRegSvr32Failed=RegSvr32 luhtus koodiga %1
+ErrorRegisterTypeLib=Unable to register the type library: %1
+
+; *** Post-installation errors
+ErrorOpeningReadme=README (LoeMind) faili avamisel ilmnes viga.
+ErrorRestartingComputer=Paigaldaja ei suutnud arvutit taask�ivitada. Palun tee seda k�sitsi.
+
+; *** Uninstaller messages
+UninstallNotFound=Faili "%1" ei ole olemas. Ei saa eemaldada.
+UninstallOpenError=Faili "%1" ei saanud avada. Ei saa eemaldada.
+UninstallUnsupportedVer=Eemaldamise logifaili "%1" formaat on tundmatu selle versiooni eemaldaja jaoks. Ei saa eemaldada
+UninstallUnknownEntry=Eemaldaja logis on tundmatu kirje (%1)
+ConfirmUninstall=Oled kindel, et soovid eemaldada %1'i ja k�ik selle komponendid?
+UninstallOnlyOnWin64=Seda paigaldamist saab eemaldada ainult 64-bitises Windowsis.
+OnlyAdminCanUninstall=Seda paigaldamist saab eemaldada ainult administraatori�igustega kasutaja.
+UninstallStatusLabel=Palun oota, kuni %1 eemaldatakse sinu arvutist.
+UninstalledAll=%1 eemaldati sinu arvutist edukalt.
+UninstalledMost=%1'i eemaldamine �nnestus.%n%nM�ned elemendid j�id alles. Need v�ib k�sitsi kustutada.
+UninstalledAndNeedsRestart=%1'i eemaldamise l�petamiseks peab arvuti taask�ivituma.%n%nKas soovid kohe taask�ivitada?
+UninstallDataCorrupted="%1" fail on rikutud. Ei saa eemaldada
+
+; *** Uninstallation phase messages
+ConfirmDeleteSharedFileTitle=Kas kustutan �hiskasutuses oleva faili?
+ConfirmDeleteSharedFile2=S�steem kinnitab, et �hiskasutuses olevat faili ei kasuta �kski teine programm. Kas soovid, et eemaldaja selle �hiskasutuses oleva faili kustutaks?%n%nKui m�ni programm seda siiski veel kasutab, siis ei pruugi see enam korralikult t��tada. Kui sa pole kindel, vali Ei. Faili allesj�tmine ei tekita probleeme.
+SharedFileNameLabel=Faili nimi:
+SharedFileLocationLabel=Asukoht:
+WizardUninstalling=Eemaldamise staatus
+StatusUninstalling=%1'i eemaldamine...
+
+; *** Shutdown block reasons
+ShutdownBlockReasonInstallingApp=%1'i paigaldamine.
+ShutdownBlockReasonUninstallingApp=%1'i eemaldamine.
+
+; The custom messages below aren't used by Setup itself, but if you make
+; use of them in your scripts, you'll want to translate them.
+
+[CustomMessages]
+
+NameAndVersion=%1 versiooniga %2
+AdditionalIcons=T�iendavad ikoonid:
+CreateDesktopIcon=Loo &t��laua ikoon
+CreateQuickLaunchIcon=Loo &kiirk�ivituse ikoon
+ProgramOnTheWeb=%1 veebis
+UninstallProgram=%1 - eemalda
+LaunchProgram=K�ivita %1
+AssocFileExtension=&Seosta %1 %2 faililaiendiga
+AssocingFileExtension=Seostan %1 %2 faililaiendiga...
+AutoStartProgramGroupDescription=K�ivitus:
+AutoStartProgram=K�ivita %1 automaatselt
+AddonHostProgramNotFound=%1 ei asu sinu valitud kaustas.%n%nKas soovid sellegipoolest j�tkata?
diff --git a/translation/installer_de.isl b/translation/installer_de.isl
index 76ed998..c722515 100644
--- a/translation/installer_de.isl
+++ b/translation/installer_de.isl
@@ -5,7 +5,7 @@ AppTitle=Ricochet - Anonymes Instant Messaging
UninstallShortcut=Ricochet deinstallieren
RunShortcut=Ricochet starten
PortableDesc=Wollen Sie Ricochet als Portable-Variante installieren?
-PortableText=Ricochet kann auf Ihrem System installiert, oder in einen Ordner als Portable-Variante entpackt werden. Die Portable-Variante kann zwischen versch. Computern bewegt werden ebenso wie auf einem USB-Stick.
+PortableText=Ricochet kann auf Ihrem System installiert, oder in einen Ordner als Portable-Variante entpackt werden. Die Portable-Variante kann zwischen verschiedenen Computern bewegt werden oder auf einer verschl�sselten Festplatte gespeichert werden.
PortableTitle=Installationsmodus
PortableOptInstall=Installieren (Empfohlen)
PortableOptExtract=Entpacken (Portable)
diff --git a/translation/installer_et_EE.isl b/translation/installer_et_EE.isl
new file mode 100644
index 0000000..7a7a292
--- /dev/null
+++ b/translation/installer_et_EE.isl
@@ -0,0 +1,14 @@
+[Messages]
+WelcomeLabel2=See paigaldab programmi Ricochet sinu arvutisse.
+[CustomMessages]
+AppTitle=Ricochet - Anon��msed kiirs�numid
+UninstallShortcut=Eemalda Ricochet
+RunShortcut=K�ivita Ricochet
+PortableDesc=Kas sa tahad portatiivset paigaldust?
+PortableText=Programmi Ricochet saab paigaldada sinu s�steemi v�i teha portatiivseks kataloogiks. Portatiivset paigaldusmeetodit saab �le viia teise arvutisse v�i j�tta turvaliselt m�nda kr�pteeritud k�vakettale.
+PortableTitle=Paigaldusmeetod
+PortableOptInstall=Paigalda (Soovitav)
+PortableOptExtract=Paki lahti (Portatiivne)
+BtnExtract=Paki lahti
+ExtractDirText=Ricochet paigaldatakse j�rgnevasse kataloogi
+ExtractDirDesc=Kuhu Ricochet tuleb lahti pakkida?
diff --git a/translation/installer_it_IT.isl b/translation/installer_it_IT.isl
new file mode 100644
index 0000000..812a580
--- /dev/null
+++ b/translation/installer_it_IT.isl
@@ -0,0 +1,14 @@
+[Messages]
+WelcomeLabel2=Questo installer� Ricochet sul tuo computer
+[CustomMessages]
+AppTitle=Ricochet - Messaggistica istantanea anonima
+UninstallShortcut=Disinstalla Ricochet
+RunShortcut=Avvia Ricochet
+PortableDesc=Vuoi un'installazione portabile?
+PortableText=Ricochet pu� essere installato sul tuo sistema, o estratto in una cartella portabile. L'installazione portabile pu� essere spostata fra computer o tenuta al sicuro su un disco rigido crittografato.
+PortableTitle=Modalit� di installazione
+PortableOptInstall=Installa (Consigliato)
+PortableOptExtract=Estrai (Portabile)
+BtnExtract=Estrai
+ExtractDirText=Ricochet verr� estratto nella seguente cartella
+ExtractDirDesc=Dove vuoi che venga estratto Ricochet?
diff --git a/translation/installer_nb.isl b/translation/installer_nb.isl
new file mode 100644
index 0000000..446e624
--- /dev/null
+++ b/translation/installer_nb.isl
@@ -0,0 +1,14 @@
+[Messages]
+WelcomeLabel2=Dette vil installere Ricochet p� din datamaskin.
+[CustomMessages]
+AppTitle=Ricochet - anonyme lynmeldinger
+UninstallShortcut=Avinstaller Ricochet
+RunShortcut=Start Ricochet
+PortableDesc=�nsker du en flyttbar installasjon?
+PortableText=Ricochet kan enten installeres eller bli pakket ut til en vanlig flyttbar mappe. Som flyttbar mappe kan installasjonen flyttes mellom datamaskiner eller i stedet bli oppbevart sikkert p� en kryptert harddisk.
+PortableTitle=Installasjonsmodus
+PortableOptInstall=Installer (anbefalt)
+PortableOptExtract=Pakk ut (flyttbar)
+BtnExtract=Pakk ut
+ExtractDirText=Ricochet vil bli pakket ut til f�lgende mappe
+ExtractDirDesc=Hvor skal Ricochet pakkes ut?
diff --git a/translation/installer_pt_PT.isl b/translation/installer_pt_PT.isl
new file mode 100644
index 0000000..26aad02
--- /dev/null
+++ b/translation/installer_pt_PT.isl
@@ -0,0 +1,14 @@
+[Messages]
+WelcomeLabel2=Isto vai instalar o Ricochet no seu computador.
+[CustomMessages]
+AppTitle=Ricochet - Mensagens Instant�neas An�nimas
+UninstallShortcut=Desinstalar o Ricochet
+RunShortcut=Iniciar o Ricochet
+PortableDesc=Deseja uma instala��o port�til?
+PortableText=O Ricochet pode ser instalado no seu sistema, ou extra�do para uma pasta port�til. A instala��o port�til pode ser movida entre computadores ou mantida segura num disco encriptado.
+PortableTitle=Modo de Instala��o
+PortableOptInstall=Instalar (Recomendado)
+PortableOptExtract=Extrair (Port�til)
+BtnExtract=Extrair
+ExtractDirText=O Ricochet ser� extra�do na seguinte pasta
+ExtractDirDesc=Onde deseja que o Ricochet seja extra�do?
diff --git a/translation/installer_ru.isl b/translation/installer_ru.isl
index 4f049a9..225bb93 100644
--- a/translation/installer_ru.isl
+++ b/translation/installer_ru.isl
@@ -4,8 +4,8 @@ WelcomeLabel2=
AppTitle=Ricochet - ��������� ����������
UninstallShortcut=������� Ricochet
RunShortcut=��������� Ricochet
-PortableDesc=����� ��� ��������� ��� ��� ����������������?
-PortableText=Ricochet ����� ���� ���������� � ������� ��� ������� ��������� ��� �������� � ��������� �����. ����� ���������� �� ������� ��������� Ricochet �� ����-�����, ������ ��������� ��� ������������� ���������.
+PortableDesc=���������� ����������� ������?
+PortableText=Ricochet ����� ���� ���������� � ������� ��� ������� ��������� ��� �������� � ��������� �����. �� ������ ���������� ����� � ����������� ���������� ����� ������������ ��� ������� � � ������������ �� ������������� �����.
PortableTitle=��� ���������
PortableOptInstall=���������� (�������������)
PortableOptExtract=������� (����������� ������)
diff --git a/translation/installer_sq.isl b/translation/installer_sq.isl
new file mode 100644
index 0000000..3009eaa
--- /dev/null
+++ b/translation/installer_sq.isl
@@ -0,0 +1,14 @@
+[Messages]
+WelcomeLabel2=Ky do t� instaloj� Ricochet-in n� kompjuterin tuaj.
+[CustomMessages]
+AppTitle=Ricochet - Shk�mbim Anonim Mesazhesh t� Atyp�ratysh�m
+UninstallShortcut=�instaloje Ricochet-in
+RunShortcut=Nise Ricochet-in
+PortableDesc=Doni nj� instalim mbart�s?
+PortableText=Ricochet-i mund t� instalohet n� sistemin tuaj, ose t� p�rftohet n� nj� dosje mbart�se. Instalimi mbart�s mund t� l�vizet nga nj� kompjuter n� nj� tjet�r, ose t� ruhet i parrezik n� nj� disk t� fsheht�zuar.
+PortableTitle=M�nyr� Instalimi
+PortableOptInstall=Instalim (E k�shilluar)
+PortableOptExtract=P�rftim (Mbart�s)
+BtnExtract=P�rftoje
+ExtractDirText=Ricochet-i do t� p�rftohet n� dosjen vijuese
+ExtractDirDesc=Ku duhet p�rftuar Ricochet-i?
diff --git a/translation/installer_zh_HK.isl b/translation/installer_zh_HK.isl
new file mode 100644
index 0000000..113a908
--- /dev/null
+++ b/translation/installer_zh_HK.isl
@@ -0,0 +1,14 @@
+[Messages]
+WelcomeLabel2=���������X�ϰ��b Ricochet
+[CustomMessages]
+AppTitle= Ricochet-�����ļ��rӍϢ
+UninstallShortcut=�Ƴ� Ricochet
+RunShortcut=���� Ricochet
+PortableDesc=���Ƿ�Ҫʹ�ÿɔyʽ�Gɫ���b
+PortableText=Ricochet�����b�����ϵ�y�ϻ��ǽ≺��һ���ɔy����USB�Y��Ŀ��¡��ɔyʽ�ľGɫ���b�����ڲ�ͬ����X��ʹ�û���һ�����ܵ�Ӳ����
+PortableTitle=���bģʽ
+PortableOptInstall=���b (���h)
+PortableOptExtract=�≺�s (�ɔyʽ���b)
+BtnExtract=�≺�s
+ExtractDirText=Ricochet�����≺�s�����µ��Y�ϊA
+ExtractDirDesc=Ricochet�ęn�����≺�s����̎?
diff --git a/translation/ricochet_bg.ts b/translation/ricochet_bg.ts
index dcbede5..b11961b 100644
--- a/translation/ricochet_bg.ts
+++ b/translation/ricochet_bg.ts
@@ -54,27 +54,27 @@
<context>
<name>ContactIDField</name>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="40"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="41"/>
<source><b>%1</b> is already your contact</source>
<translation><b>%1</b> вече е твой контакт</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="42"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="43"/>
<source>You can't add yourself as a contact</source>
<translation>Не може да добавиш себе си като контакт</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="44"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="45"/>
<source>Enter an ID starting with <b>ricochet:</b></source>
<translation>Въведи Идентификатор с <b>рикошет:</b></translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="80"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="81"/>
<source>Copied to clipboard</source>
<translation>Копирано</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="92"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="93"/>
<source>Copy</source>
<translation>Копирай</translation>
</message>
@@ -210,37 +210,45 @@
<context>
<name>GeneralPreferences</name>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="12"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="13"/>
<source>Use a single window for conversations</source>
<translation>Използвай само един прозорец за всички разговори</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="20"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="21"/>
<source>Open links in default browser without prompting</source>
<translation>Отваряй връзките в браузъра по подразбиране без да искаш разрешение</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="28"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="29"/>
<source>Play audio notifications</source>
<translation>Използвай звукови известия</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="37"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="38"/>
<source>Volume</source>
<translation>Звук</translation>
</message>
+ <message>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="53"/>
+ <source>Language</source>
+ <translation type="unfinished">Език</translation>
+ </message>
+ <message>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="76"/>
+ <source>Restart Ricochet to apply changes</source>
+ <translation type="unfinished">Рестартирай Richchet, за да приложиш промените</translation>
+ </message>
</context>
<context>
<name>LanguagePreferences</name>
<message>
- <location filename="../src/ui/qml/LanguagePreferences.qml" line="22"/>
<source>Select Language</source>
- <translation>Избери език</translation>
+ <translation type="vanished">Избери език</translation>
</message>
<message>
- <location filename="../src/ui/qml/LanguagePreferences.qml" line="52"/>
<source>Restart Ricochet to apply changes</source>
- <translation>Рестартирай Richchet, за да приложиш промените</translation>
+ <translation type="vanished">Рестартирай Richchet, за да приложиш промените</translation>
</message>
</context>
<context>
@@ -254,7 +262,7 @@
<context>
<name>Main</name>
<message>
- <location filename="../src/main.cpp" line="73"/>
+ <location filename="../src/main.cpp" line="81"/>
<source>Ricochet Error</source>
<translation>Рикошет Грешка</translation>
</message>
@@ -436,22 +444,21 @@
<translation>Главни</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="46"/>
<source>Language</source>
- <translation>Език</translation>
+ <translation type="vanished">Език</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="51"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="46"/>
<source>Contacts</source>
<translation>Контакти</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="56"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="51"/>
<source>Tor</source>
<translation>Тор</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="61"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="56"/>
<source>About</source>
<translation>За Програмта</translation>
</message>
@@ -509,84 +516,84 @@
<context>
<name>TorConfigurationPage</name>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="72"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="73"/>
<source>Does this computer need a proxy to access the internet?</source>
<translation>Този компютър нуждае ли се от прокси, за да се свърже с интернет?</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="84"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="85"/>
<source>Proxy type:</source>
<translation>Вид Прокси:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="89"/>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="91"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="90"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="92"/>
<source>None</source>
<translation>Никакво</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="106"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="107"/>
<source>Address:</source>
<translation>Адрес:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="115"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="116"/>
<source>IP address or hostname</source>
<translation>IP адрес или hostname</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="118"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="119"/>
<source>Port:</source>
<translation>Порт:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="129"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="130"/>
<source>Username:</source>
<translation>Потребителско Име:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="139"/>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="149"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="140"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="150"/>
<source>Optional</source>
<translation>Незадължително</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="142"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="143"/>
<source>Password:</source>
<translation>Парола:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="159"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="160"/>
<source>Does this computer's Internet connection go through a firewall that only allows connections to certain ports?</source>
<translation>Минава ли интернет връзката на този компютър през firewall програма, която позволява връзка само през определени портове?</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="170"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="171"/>
<source>Allowed ports:</source>
<translation>Разрешени портове:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="177"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="178"/>
<source>Example: 80,443</source>
<translation>Пример: 80,443</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="188"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="189"/>
<source>If this computer's Internet connection is censored, you will need to obtain and use bridge relays.</source>
<translation>Ако интернет връзката на този компютър е цензурирана, ще се наложи да намериш и използваш bridge relays.</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="197"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="198"/>
<source>Enter one or more bridge relays (one per line):</source>
<translation>Въведи едно или повече bridge relays (по едно на ред):</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="212"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="213"/>
<source>Back</source>
<translation>Назад</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="219"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="220"/>
<source>Connect</source>
<translation>Свържи</translation>
</message>
diff --git a/translation/ricochet_cs.ts b/translation/ricochet_cs.ts
index f5d39f5..ae31217 100644
--- a/translation/ricochet_cs.ts
+++ b/translation/ricochet_cs.ts
@@ -54,27 +54,27 @@
<context>
<name>ContactIDField</name>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="40"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="41"/>
<source><b>%1</b> is already your contact</source>
<translation><b>%1</b> již je v seznamu kontaktů</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="42"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="43"/>
<source>You can't add yourself as a contact</source>
<translation>Nelze přidat vlastní adresu na seznam kontaktů</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="44"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="45"/>
<source>Enter an ID starting with <b>ricochet:</b></source>
<translation>Zadejte ID začínající slovem <b>ricochet:</b></translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="80"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="81"/>
<source>Copied to clipboard</source>
<translation>Zkopírováno do schránky</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="92"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="93"/>
<source>Copy</source>
<translation>Zkopírovat</translation>
</message>
@@ -104,7 +104,7 @@
<message>
<location filename="../src/ui/qml/ContactList.qml" line="80"/>
<source>Outdated</source>
- <translation type="unfinished"></translation>
+ <translation>Zastaralé</translation>
</message>
</context>
<context>
@@ -163,7 +163,7 @@
<message>
<location filename="../src/ui/qml/ContactPreferences.qml" line="163"/>
<source>Rename</source>
- <translation type="unfinished">Přejmenovat</translation>
+ <translation>Přejmenovat</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactPreferences.qml" line="170"/>
@@ -210,37 +210,45 @@
<context>
<name>GeneralPreferences</name>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="12"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="13"/>
<source>Use a single window for conversations</source>
<translation>Používat totéž okno pro všechny konverzace</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="20"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="21"/>
<source>Open links in default browser without prompting</source>
<translation>Otevírat odkazy v defaultním prohlížeči bez dotazování</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="28"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="29"/>
<source>Play audio notifications</source>
- <translation type="unfinished"></translation>
+ <translation>Povolit zvukové upozornění</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="37"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="38"/>
<source>Volume</source>
- <translation type="unfinished"></translation>
+ <translation>Hlasitost</translation>
+ </message>
+ <message>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="53"/>
+ <source>Language</source>
+ <translation type="unfinished">Jazyk</translation>
+ </message>
+ <message>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="76"/>
+ <source>Restart Ricochet to apply changes</source>
+ <translation type="unfinished">Restartovat Ricochet aby se změny projevily</translation>
</message>
</context>
<context>
<name>LanguagePreferences</name>
<message>
- <location filename="../src/ui/qml/LanguagePreferences.qml" line="22"/>
<source>Select Language</source>
- <translation type="unfinished"></translation>
+ <translation type="vanished">Vybrat jazyk</translation>
</message>
<message>
- <location filename="../src/ui/qml/LanguagePreferences.qml" line="52"/>
<source>Restart Ricochet to apply changes</source>
- <translation type="unfinished"></translation>
+ <translation type="vanished">Restartovat Ricochet aby se změny projevily</translation>
</message>
</context>
<context>
@@ -248,13 +256,13 @@
<message>
<location filename="../src/ui/LanguagesModel.cpp" line="43"/>
<source>System default</source>
- <translation type="unfinished"></translation>
+ <translation>Systémový</translation>
</message>
</context>
<context>
<name>Main</name>
<message>
- <location filename="../src/main.cpp" line="73"/>
+ <location filename="../src/main.cpp" line="81"/>
<source>Ricochet Error</source>
<translation>Chyba programu Ricochet</translation>
</message>
@@ -321,12 +329,12 @@
<message>
<location filename="../src/ui/qml/MessageDelegate.qml" line="166"/>
<source>Copy Message</source>
- <translation type="unfinished"></translation>
+ <translation>Kopírovat zprávu</translation>
</message>
<message>
<location filename="../src/ui/qml/MessageDelegate.qml" line="173"/>
<source>Copy Selection</source>
- <translation type="unfinished"></translation>
+ <translation>Kopírovat výběr</translation>
</message>
</context>
<context>
@@ -436,22 +444,21 @@
<translation>Obecné</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="46"/>
<source>Language</source>
- <translation type="unfinished"></translation>
+ <translation type="vanished">Jazyk</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="51"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="46"/>
<source>Contacts</source>
<translation>Kontakty</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="56"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="51"/>
<source>Tor</source>
<translation>Tor</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="61"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="56"/>
<source>About</source>
<translation>O programu</translation>
</message>
@@ -509,84 +516,84 @@
<context>
<name>TorConfigurationPage</name>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="72"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="73"/>
<source>Does this computer need a proxy to access the internet?</source>
<translation>Potřebuje tento počítač pro přístup na internet proxy?</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="84"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="85"/>
<source>Proxy type:</source>
<translation>Typ proxy:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="89"/>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="91"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="90"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="92"/>
<source>None</source>
<translation>Žádný</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="106"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="107"/>
<source>Address:</source>
<translation>Adresa:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="115"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="116"/>
<source>IP address or hostname</source>
<translation>IP adresa nebo hostname</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="118"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="119"/>
<source>Port:</source>
<translation>Port:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="129"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="130"/>
<source>Username:</source>
<translation>Username:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="139"/>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="149"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="140"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="150"/>
<source>Optional</source>
<translation>Volitelné</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="142"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="143"/>
<source>Password:</source>
<translation>Heslo:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="159"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="160"/>
<source>Does this computer's Internet connection go through a firewall that only allows connections to certain ports?</source>
<translation>Prochází připojení tohoto počítače na internet přes firewall, jenž umožňuje připojení pouze na určité porty?</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="170"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="171"/>
<source>Allowed ports:</source>
<translation>Povolené porty:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="177"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="178"/>
<source>Example: 80,443</source>
<translation>Příklad: 80,443</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="188"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="189"/>
<source>If this computer's Internet connection is censored, you will need to obtain and use bridge relays.</source>
<translation>Je-li připojení tohoto počítače na internet cenzurováno, potřebujete získat a používat bridge relays.</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="197"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="198"/>
<source>Enter one or more bridge relays (one per line):</source>
<translation>Zadejte jeden či více bridge relays (na jednotlivé řádky):</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="212"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="213"/>
<source>Back</source>
<translation>Zpět</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="219"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="220"/>
<source>Connect</source>
<translation>Připojit</translation>
</message>
diff --git a/translation/ricochet_da.ts b/translation/ricochet_da.ts
index 03a1fed..c6c6dc9 100644
--- a/translation/ricochet_da.ts
+++ b/translation/ricochet_da.ts
@@ -54,27 +54,27 @@
<context>
<name>ContactIDField</name>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="40"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="41"/>
<source><b>%1</b> is already your contact</source>
<translation><b>%1</b> er allerede på din kontaktliste</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="42"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="43"/>
<source>You can't add yourself as a contact</source>
<translation>Du kan ikke tilføje dig selv som kontaktperson</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="44"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="45"/>
<source>Enter an ID starting with <b>ricochet:</b></source>
<translation>Skriv et ID der begynder med <b>ricochet:</b></translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="80"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="81"/>
<source>Copied to clipboard</source>
<translation>Kopieret til clipboardet</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="92"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="93"/>
<source>Copy</source>
<translation>Kopiér</translation>
</message>
@@ -210,37 +210,45 @@
<context>
<name>GeneralPreferences</name>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="12"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="13"/>
<source>Use a single window for conversations</source>
<translation>Hold samtaler i ét vindue</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="20"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="21"/>
<source>Open links in default browser without prompting</source>
<translation>Åbn links i browser uden at spørge</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="28"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="29"/>
<source>Play audio notifications</source>
<translation>Afspil lydnotifikationer</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="37"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="38"/>
<source>Volume</source>
<translation>Lydstyrke</translation>
</message>
+ <message>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="53"/>
+ <source>Language</source>
+ <translation type="unfinished">Sprog</translation>
+ </message>
+ <message>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="76"/>
+ <source>Restart Ricochet to apply changes</source>
+ <translation type="unfinished">Genstart Ricochet for at anvende nye indstillinger</translation>
+ </message>
</context>
<context>
<name>LanguagePreferences</name>
<message>
- <location filename="../src/ui/qml/LanguagePreferences.qml" line="22"/>
<source>Select Language</source>
- <translation>Vælg sprog</translation>
+ <translation type="vanished">Vælg sprog</translation>
</message>
<message>
- <location filename="../src/ui/qml/LanguagePreferences.qml" line="52"/>
<source>Restart Ricochet to apply changes</source>
- <translation>Genstart Ricochet for at anvende nye indstillinger</translation>
+ <translation type="vanished">Genstart Ricochet for at anvende nye indstillinger</translation>
</message>
</context>
<context>
@@ -254,7 +262,7 @@
<context>
<name>Main</name>
<message>
- <location filename="../src/main.cpp" line="73"/>
+ <location filename="../src/main.cpp" line="81"/>
<source>Ricochet Error</source>
<translation>Ricochet Fejl</translation>
</message>
@@ -436,22 +444,21 @@
<translation>Generelt</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="46"/>
<source>Language</source>
- <translation>Sprog</translation>
+ <translation type="vanished">Sprog</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="51"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="46"/>
<source>Contacts</source>
<translation>Kontaktpersoner</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="56"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="51"/>
<source>Tor</source>
<translation>Tor</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="61"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="56"/>
<source>About</source>
<translation>Om</translation>
</message>
@@ -509,84 +516,84 @@
<context>
<name>TorConfigurationPage</name>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="72"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="73"/>
<source>Does this computer need a proxy to access the internet?</source>
<translation>Skal denne computer forbinde gennem en proxy for at tilgå internettet?</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="84"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="85"/>
<source>Proxy type:</source>
<translation>Proxy type:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="89"/>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="91"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="90"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="92"/>
<source>None</source>
<translation>Ingen</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="106"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="107"/>
<source>Address:</source>
<translation>Adresse:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="115"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="116"/>
<source>IP address or hostname</source>
<translation>IP-adresse eller værtsnavn</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="118"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="119"/>
<source>Port:</source>
<translation>Port:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="129"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="130"/>
<source>Username:</source>
<translation>Brugernavn:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="139"/>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="149"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="140"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="150"/>
<source>Optional</source>
<translation>Valgfrit</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="142"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="143"/>
<source>Password:</source>
<translation>Adgangskode:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="159"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="160"/>
<source>Does this computer's Internet connection go through a firewall that only allows connections to certain ports?</source>
<translation>Går denne computers internetforbindelse gennem en firewall der kun tillader forbindelser på visse porte?</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="170"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="171"/>
<source>Allowed ports:</source>
<translation>Tilladte porte:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="177"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="178"/>
<source>Example: 80,443</source>
<translation>Eksempel: 80,443</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="188"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="189"/>
<source>If this computer's Internet connection is censored, you will need to obtain and use bridge relays.</source>
<translation>Hvis denne computers internetforbindelse er censureret, er du nødt til at finde og benytte bridge relæer.</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="197"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="198"/>
<source>Enter one or more bridge relays (one per line):</source>
<translation>Indsæt én eller flere bridgerelæer (én per linje):</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="212"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="213"/>
<source>Back</source>
<translation>Tilbage</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="219"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="220"/>
<source>Connect</source>
<translation>Forbind</translation>
</message>
diff --git a/translation/ricochet_de.ts b/translation/ricochet_de.ts
index b348b12..04b3545 100644
--- a/translation/ricochet_de.ts
+++ b/translation/ricochet_de.ts
@@ -54,27 +54,27 @@
<context>
<name>ContactIDField</name>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="40"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="41"/>
<source><b>%1</b> is already your contact</source>
<translation><b>%1</b> ist bereits dein Kontakt</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="42"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="43"/>
<source>You can't add yourself as a contact</source>
<translation>Du kannst dich nicht selbst als Kontakt hinzufügen</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="44"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="45"/>
<source>Enter an ID starting with <b>ricochet:</b></source>
<translation>Gebe eine ID an, beginnend mit <b>ricochet:<b></translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="80"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="81"/>
<source>Copied to clipboard</source>
<translation>In die Zwischenablage kopiert</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="92"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="93"/>
<source>Copy</source>
<translation>Kopieren</translation>
</message>
@@ -210,37 +210,45 @@
<context>
<name>GeneralPreferences</name>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="12"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="13"/>
<source>Use a single window for conversations</source>
<translation>Nutze ein einzelnes Fenster für Unterhaltungen</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="20"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="21"/>
<source>Open links in default browser without prompting</source>
<translation>Öffne Links im Standardbrowser ohne Nachfrage</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="28"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="29"/>
<source>Play audio notifications</source>
<translation>Benachrichtigungston abspielen</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="37"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="38"/>
<source>Volume</source>
<translation>Lautstärke</translation>
</message>
+ <message>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="53"/>
+ <source>Language</source>
+ <translation type="unfinished">Sprache</translation>
+ </message>
+ <message>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="76"/>
+ <source>Restart Ricochet to apply changes</source>
+ <translation type="unfinished">Starte Ricochet neu, um Änderungung anzuwenden</translation>
+ </message>
</context>
<context>
<name>LanguagePreferences</name>
<message>
- <location filename="../src/ui/qml/LanguagePreferences.qml" line="22"/>
<source>Select Language</source>
- <translation>Sprache auswählen</translation>
+ <translation type="vanished">Sprache auswählen</translation>
</message>
<message>
- <location filename="../src/ui/qml/LanguagePreferences.qml" line="52"/>
<source>Restart Ricochet to apply changes</source>
- <translation>Starte Ricochet neu, um Änderungung anzuwenden</translation>
+ <translation type="vanished">Starte Ricochet neu, um Änderungung anzuwenden</translation>
</message>
</context>
<context>
@@ -254,7 +262,7 @@
<context>
<name>Main</name>
<message>
- <location filename="../src/main.cpp" line="73"/>
+ <location filename="../src/main.cpp" line="81"/>
<source>Ricochet Error</source>
<translation>Ricochet Fehler</translation>
</message>
@@ -436,22 +444,21 @@
<translation>Allgemein</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="46"/>
<source>Language</source>
- <translation>Sprache</translation>
+ <translation type="vanished">Sprache</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="51"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="46"/>
<source>Contacts</source>
<translation>Kontakte</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="56"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="51"/>
<source>Tor</source>
<translation>Tor</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="61"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="56"/>
<source>About</source>
<translation>Über</translation>
</message>
@@ -509,84 +516,84 @@
<context>
<name>TorConfigurationPage</name>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="72"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="73"/>
<source>Does this computer need a proxy to access the internet?</source>
<translation>Benötigt dieser Rechner einen Proxy um sich mit dem Internet zu verbinden?</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="84"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="85"/>
<source>Proxy type:</source>
<translation>Proxytyp:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="89"/>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="91"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="90"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="92"/>
<source>None</source>
<translation>Keiner</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="106"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="107"/>
<source>Address:</source>
<translation>Adresse:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="115"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="116"/>
<source>IP address or hostname</source>
<translation>IP-Adresse oder Rechnername</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="118"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="119"/>
<source>Port:</source>
<translation>Port:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="129"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="130"/>
<source>Username:</source>
<translation>Benutzername:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="139"/>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="149"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="140"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="150"/>
<source>Optional</source>
<translation>Fakultativ</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="142"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="143"/>
<source>Password:</source>
<translation>Passwort:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="159"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="160"/>
<source>Does this computer's Internet connection go through a firewall that only allows connections to certain ports?</source>
<translation>Geht die Verbindung dieses Rechners durch eine Firewall, die nur Verbindungen zu manchen Ports erlaubt?</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="170"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="171"/>
<source>Allowed ports:</source>
<translation>Erlaubte Ports:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="177"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="178"/>
<source>Example: 80,443</source>
<translation>Beispiel: 80, 443</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="188"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="189"/>
<source>If this computer's Internet connection is censored, you will need to obtain and use bridge relays.</source>
<translation>Sollte die Internetverbindung dieses Rechners zensiert sein, werden Sie Brücken-Relays finden und nutzen müssen.</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="197"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="198"/>
<source>Enter one or more bridge relays (one per line):</source>
<translation>Geben Sie ein oder mehrere Brücken-Relays an (eins pro Zeile):</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="212"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="213"/>
<source>Back</source>
<translation>Zurück</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="219"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="220"/>
<source>Connect</source>
<translation>Verbinden</translation>
</message>
diff --git a/translation/ricochet_en.ts b/translation/ricochet_en.ts
index e8e3a00..de044b7 100644
--- a/translation/ricochet_en.ts
+++ b/translation/ricochet_en.ts
@@ -54,27 +54,27 @@
<context>
<name>ContactIDField</name>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="40"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="41"/>
<source><b>%1</b> is already your contact</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="42"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="43"/>
<source>You can't add yourself as a contact</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="44"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="45"/>
<source>Enter an ID starting with <b>ricochet:</b></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="80"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="81"/>
<source>Copied to clipboard</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="92"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="93"/>
<source>Copy</source>
<translation type="unfinished"></translation>
</message>
@@ -210,35 +210,32 @@
<context>
<name>GeneralPreferences</name>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="12"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="13"/>
<source>Use a single window for conversations</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="20"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="21"/>
<source>Open links in default browser without prompting</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="28"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="29"/>
<source>Play audio notifications</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="37"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="38"/>
<source>Volume</source>
<translation type="unfinished"></translation>
</message>
-</context>
-<context>
- <name>LanguagePreferences</name>
<message>
- <location filename="../src/ui/qml/LanguagePreferences.qml" line="22"/>
- <source>Select Language</source>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="53"/>
+ <source>Language</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/ui/qml/LanguagePreferences.qml" line="52"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="76"/>
<source>Restart Ricochet to apply changes</source>
<translation type="unfinished"></translation>
</message>
@@ -254,7 +251,7 @@
<context>
<name>Main</name>
<message>
- <location filename="../src/main.cpp" line="73"/>
+ <location filename="../src/main.cpp" line="81"/>
<source>Ricochet Error</source>
<translation type="unfinished"></translation>
</message>
@@ -437,21 +434,16 @@
</message>
<message>
<location filename="../src/ui/qml/PreferencesDialog.qml" line="46"/>
- <source>Language</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="51"/>
<source>Contacts</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="56"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="51"/>
<source>Tor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="61"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="56"/>
<source>About</source>
<translation type="unfinished"></translation>
</message>
@@ -509,84 +501,84 @@
<context>
<name>TorConfigurationPage</name>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="72"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="73"/>
<source>Does this computer need a proxy to access the internet?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="84"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="85"/>
<source>Proxy type:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="89"/>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="91"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="90"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="92"/>
<source>None</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="106"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="107"/>
<source>Address:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="115"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="116"/>
<source>IP address or hostname</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="118"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="119"/>
<source>Port:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="129"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="130"/>
<source>Username:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="139"/>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="149"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="140"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="150"/>
<source>Optional</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="142"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="143"/>
<source>Password:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="159"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="160"/>
<source>Does this computer's Internet connection go through a firewall that only allows connections to certain ports?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="170"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="171"/>
<source>Allowed ports:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="177"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="178"/>
<source>Example: 80,443</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="188"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="189"/>
<source>If this computer's Internet connection is censored, you will need to obtain and use bridge relays.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="197"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="198"/>
<source>Enter one or more bridge relays (one per line):</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="212"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="213"/>
<source>Back</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="219"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="220"/>
<source>Connect</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translation/ricochet_es.ts b/translation/ricochet_es.ts
index aa084de..32c7829 100644
--- a/translation/ricochet_es.ts
+++ b/translation/ricochet_es.ts
@@ -54,27 +54,27 @@
<context>
<name>ContactIDField</name>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="40"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="41"/>
<source><b>%1</b> is already your contact</source>
<translation><b>%1</b> ya es su contacto</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="42"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="43"/>
<source>You can't add yourself as a contact</source>
<translation>No puede añadirse a usted mismo como un contacto</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="44"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="45"/>
<source>Enter an ID starting with <b>ricochet:</b></source>
<translation>Introduzca un ID comience con <b>ricochet:</b></translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="80"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="81"/>
<source>Copied to clipboard</source>
<translation>Copiado al portapapeles</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="92"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="93"/>
<source>Copy</source>
<translation>Copiar</translation>
</message>
@@ -210,37 +210,45 @@
<context>
<name>GeneralPreferences</name>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="12"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="13"/>
<source>Use a single window for conversations</source>
<translation>Usar una única ventana para conversaciones</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="20"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="21"/>
<source>Open links in default browser without prompting</source>
<translation>Abrir enlaces en el navegador predeterminado sin pedir confirmación</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="28"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="29"/>
<source>Play audio notifications</source>
<translation>Reproducir notificaciones de audio</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="37"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="38"/>
<source>Volume</source>
<translation>Volumen</translation>
</message>
+ <message>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="53"/>
+ <source>Language</source>
+ <translation type="unfinished">Idioma</translation>
+ </message>
+ <message>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="76"/>
+ <source>Restart Ricochet to apply changes</source>
+ <translation type="unfinished">Reiniciar Ricochet para aplicar los cambios</translation>
+ </message>
</context>
<context>
<name>LanguagePreferences</name>
<message>
- <location filename="../src/ui/qml/LanguagePreferences.qml" line="22"/>
<source>Select Language</source>
- <translation>Seleccionar idioma</translation>
+ <translation type="vanished">Seleccionar idioma</translation>
</message>
<message>
- <location filename="../src/ui/qml/LanguagePreferences.qml" line="52"/>
<source>Restart Ricochet to apply changes</source>
- <translation>Reiniciar Ricochet para aplicar los cambios</translation>
+ <translation type="vanished">Reiniciar Ricochet para aplicar los cambios</translation>
</message>
</context>
<context>
@@ -254,7 +262,7 @@
<context>
<name>Main</name>
<message>
- <location filename="../src/main.cpp" line="73"/>
+ <location filename="../src/main.cpp" line="81"/>
<source>Ricochet Error</source>
<translation>Error de Ricochet</translation>
</message>
@@ -436,22 +444,21 @@
<translation>General</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="46"/>
<source>Language</source>
- <translation>Idioma</translation>
+ <translation type="vanished">Idioma</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="51"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="46"/>
<source>Contacts</source>
<translation>Contactos</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="56"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="51"/>
<source>Tor</source>
<translation>Tor</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="61"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="56"/>
<source>About</source>
<translation>Acerca de</translation>
</message>
@@ -509,84 +516,84 @@
<context>
<name>TorConfigurationPage</name>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="72"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="73"/>
<source>Does this computer need a proxy to access the internet?</source>
<translation>¿Este equipo necesita un proxy para acceder a Internet?</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="84"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="85"/>
<source>Proxy type:</source>
<translation>Tipo de proxy:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="89"/>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="91"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="90"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="92"/>
<source>None</source>
<translation>Ninguno</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="106"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="107"/>
<source>Address:</source>
<translation>Dirección:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="115"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="116"/>
<source>IP address or hostname</source>
<translation>Dirección IP o nombre del equipo</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="118"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="119"/>
<source>Port:</source>
<translation>Puerto:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="129"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="130"/>
<source>Username:</source>
<translation>Nombre de usuario:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="139"/>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="149"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="140"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="150"/>
<source>Optional</source>
<translation>Opcional</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="142"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="143"/>
<source>Password:</source>
<translation>Contraseña:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="159"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="160"/>
<source>Does this computer's Internet connection go through a firewall that only allows connections to certain ports?</source>
<translation>¿La conexión a Internet de este equipo va a través de un cortafuegos (firewall) que sólo permite conexiones a ciertos puertos?</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="170"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="171"/>
<source>Allowed ports:</source>
<translation>Puertos permitidos:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="177"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="178"/>
<source>Example: 80,443</source>
<translation>Ejemplo: 80,443</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="188"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="189"/>
<source>If this computer's Internet connection is censored, you will need to obtain and use bridge relays.</source>
<translation>Si la conexión a Internet de este equipo está bajo censura, necesitará obtener y usar repetidores puente (bridge relays).</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="197"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="198"/>
<source>Enter one or more bridge relays (one per line):</source>
<translation>Introduzca uno o más repetidores puente (uno por línea):</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="212"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="213"/>
<source>Back</source>
<translation>Atrás</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="219"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="220"/>
<source>Connect</source>
<translation>Conectar</translation>
</message>
diff --git a/translation/ricochet_da.ts b/translation/ricochet_et_EE.ts
similarity index 72%
copy from translation/ricochet_da.ts
copy to translation/ricochet_et_EE.ts
index 03a1fed..92ca7ce 100644
--- a/translation/ricochet_da.ts
+++ b/translation/ricochet_et_EE.ts
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
-<TS version="2.1" language="da">
+<TS version="2.1" language="et_EE">
<context>
<name>AboutPreferences</name>
<message>
@@ -15,17 +15,17 @@
<message>
<location filename="../src/ui/qml/AddContactDialog.qml" line="51"/>
<source>Share your Ricochet ID to allow connection requests</source>
- <translation>Del dit Ricochet ID for at tillade kontaktanmodninger</translation>
+ <translation>Jaga oma Ricochet ID ühenduste jaoks</translation>
</message>
<message>
<location filename="../src/ui/qml/AddContactDialog.qml" line="107"/>
<source>Cancel</source>
- <translation>Annuller</translation>
+ <translation>Tühista</translation>
</message>
<message>
<location filename="../src/ui/qml/AddContactDialog.qml" line="112"/>
<source>Add</source>
- <translation>Tilføj</translation>
+ <translation>Lisa</translation>
</message>
</context>
<context>
@@ -33,50 +33,50 @@
<message>
<location filename="../src/ui/qml/ContactActions.qml" line="40"/>
<source>Open Window</source>
- <translation>Åbn Vindue</translation>
+ <translation>Ava aken</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactActions.qml" line="44"/>
<source>Details...</source>
- <translation>Detaljer...</translation>
+ <translation>Detailid...</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactActions.qml" line="48"/>
<source>Rename</source>
- <translation>Omdøb</translation>
+ <translation>Nimeta ümber</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactActions.qml" line="53"/>
<source>Remove</source>
- <translation>Fjern</translation>
+ <translation>Eemalda</translation>
</message>
</context>
<context>
<name>ContactIDField</name>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="40"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="41"/>
<source><b>%1</b> is already your contact</source>
- <translation><b>%1</b> er allerede på din kontaktliste</translation>
+ <translation><b>%1</b> on juba sinu kontaktides</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="42"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="43"/>
<source>You can't add yourself as a contact</source>
- <translation>Du kan ikke tilføje dig selv som kontaktperson</translation>
+ <translation>Sa ei saa lisada ennast kontaktiks</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="44"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="45"/>
<source>Enter an ID starting with <b>ricochet:</b></source>
- <translation>Skriv et ID der begynder med <b>ricochet:</b></translation>
+ <translation>Sisesta ID koos <b>ricochet:</b></translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="80"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="81"/>
<source>Copied to clipboard</source>
- <translation>Kopieret til clipboardet</translation>
+ <translation>Kopeeri lõikeväljale</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="92"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="93"/>
<source>Copy</source>
- <translation>Kopiér</translation>
+ <translation>Kopeeri</translation>
</message>
</context>
<context>
@@ -84,27 +84,27 @@
<message>
<location filename="../src/ui/qml/ContactList.qml" line="76"/>
<source>Online</source>
- <translation>Online</translation>
+ <translation>Võrgus</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactList.qml" line="77"/>
<source>Offline</source>
- <translation>Offline</translation>
+ <translation>Võrgust väljas</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactList.qml" line="78"/>
<source>Requests</source>
- <translation>Anmodninger</translation>
+ <translation>Päringud</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactList.qml" line="79"/>
<source>Rejected</source>
- <translation>Afvist</translation>
+ <translation>Tagasi lükatud</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactList.qml" line="80"/>
<source>Outdated</source>
- <translation>Forældet</translation>
+ <translation>Vananenud</translation>
</message>
</context>
<context>
@@ -112,63 +112,63 @@
<message>
<location filename="../src/ui/qml/ContactPreferences.qml" line="98"/>
<source>Date added:</source>
- <translation>Dato tilføjet:</translation>
+ <translation>Lisatud kuupäeval:</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactPreferences.qml" line="106"/>
<source>Last seen:</source>
- <translation>Sidst set:</translation>
+ <translation>Viimati nähtud:</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactPreferences.qml" line="116"/>
<source>Request:</source>
- <translation>Anmodning:</translation>
+ <translation>Päring:</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactPreferences.qml" line="126"/>
<source>Pending connection</source>
- <translation>Afventer forbindelse</translation>
+ <translation>Ootel ühendus</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactPreferences.qml" line="127"/>
<source>Delivered</source>
- <translation>Afleveret</translation>
+ <translation>Tarnitud</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactPreferences.qml" line="128"/>
<source>Accepted</source>
- <translation>Accepteret</translation>
+ <translation>Aksepteeritud</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactPreferences.qml" line="129"/>
<source>Error</source>
- <translation>Fejl</translation>
+ <translation>Viga</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactPreferences.qml" line="130"/>
<source>Rejected</source>
- <translation>Afvist</translation>
+ <translation>Tagasi lükatud</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactPreferences.qml" line="134"/>
<source>%1 (Connected)</source>
<extracomment>%1 status, e.g. "Accepted"</extracomment>
- <translation>%1 (Forbundet)</translation>
+ <translation>%1 (Ühendatud)</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactPreferences.qml" line="140"/>
<source>Response:</source>
- <translation>Svar:</translation>
+ <translation>Vastus:</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactPreferences.qml" line="163"/>
<source>Rename</source>
- <translation>Omdøb</translation>
+ <translation>Muuda nime</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactPreferences.qml" line="170"/>
<source>Remove</source>
- <translation>Fjern</translation>
+ <translation>Eemalda</translation>
</message>
</context>
<context>
@@ -176,17 +176,17 @@
<message>
<location filename="../src/ui/qml/ContactRequestDialog.qml" line="55"/>
<source>Someone new is asking to connect to you</source>
- <translation>Du har en ny kontaktanmodning</translation>
+ <translation>Keegi uus palub sinuga ühenduda</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactRequestDialog.qml" line="102"/>
<source>Reject</source>
- <translation>Afvis</translation>
+ <translation>Lükka tagasi</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactRequestDialog.qml" line="107"/>
<source>Accept</source>
- <translation>Acceptér</translation>
+ <translation>Luba</translation>
</message>
</context>
<context>
@@ -199,48 +199,56 @@
<message>
<location filename="../src/ui/qml/ContactRequestFields.qml" line="29"/>
<source>Name:</source>
- <translation>Navn:</translation>
+ <translation>Nimi:</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactRequestFields.qml" line="40"/>
<source>Message:</source>
- <translation>Besked:</translation>
+ <translation>Sõnum:</translation>
</message>
</context>
<context>
<name>GeneralPreferences</name>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="12"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="13"/>
<source>Use a single window for conversations</source>
- <translation>Hold samtaler i ét vindue</translation>
+ <translation>Kasuta eraldi akent suhtlemiseks</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="20"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="21"/>
<source>Open links in default browser without prompting</source>
- <translation>Åbn links i browser uden at spørge</translation>
+ <translation>Ava lingid vaikimsi brauseriga ilma märguandeta</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="28"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="29"/>
<source>Play audio notifications</source>
- <translation>Afspil lydnotifikationer</translation>
+ <translation>Mängi heli märguandeid</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="37"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="38"/>
<source>Volume</source>
- <translation>Lydstyrke</translation>
+ <translation>Heli valjus</translation>
+ </message>
+ <message>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="53"/>
+ <source>Language</source>
+ <translation type="unfinished">Keel</translation>
+ </message>
+ <message>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="76"/>
+ <source>Restart Ricochet to apply changes</source>
+ <translation type="unfinished">Taaskäivita Ricochet muudatuste jaoks </translation>
</message>
</context>
<context>
<name>LanguagePreferences</name>
<message>
- <location filename="../src/ui/qml/LanguagePreferences.qml" line="22"/>
<source>Select Language</source>
- <translation>Vælg sprog</translation>
+ <translation type="vanished">Keelevalik</translation>
</message>
<message>
- <location filename="../src/ui/qml/LanguagePreferences.qml" line="52"/>
<source>Restart Ricochet to apply changes</source>
- <translation>Genstart Ricochet for at anvende nye indstillinger</translation>
+ <translation type="vanished">Taaskäivita Ricochet muudatuste jaoks </translation>
</message>
</context>
<context>
@@ -248,15 +256,15 @@
<message>
<location filename="../src/ui/LanguagesModel.cpp" line="43"/>
<source>System default</source>
- <translation>Standardindstillinger</translation>
+ <translation>Süsteemi keel</translation>
</message>
</context>
<context>
<name>Main</name>
<message>
- <location filename="../src/main.cpp" line="73"/>
+ <location filename="../src/main.cpp" line="81"/>
<source>Ricochet Error</source>
- <translation>Ricochet Fejl</translation>
+ <translation>Ricocheti viga</translation>
</message>
</context>
<context>
@@ -264,17 +272,17 @@
<message>
<location filename="../src/ui/qml/MainToolBar.qml" line="19"/>
<source>Add Contact</source>
- <translation>Tilføj Kontaktperson</translation>
+ <translation>Lisa kontakt</translation>
</message>
<message>
<location filename="../src/ui/qml/MainToolBar.qml" line="28"/>
<source>Preferences</source>
- <translation>Indstillinger</translation>
+ <translation>Eelistused</translation>
</message>
<message>
<location filename="../src/ui/qml/MainToolBar.qml" line="75"/>
<source>Click to add contacts</source>
- <translation>Klik for at tilføje kontaktpersoner</translation>
+ <translation>Kliki kontaktide lisamiseks</translation>
</message>
</context>
<context>
@@ -282,12 +290,12 @@
<message>
<location filename="../src/ui/MainWindow.cpp" line="191"/>
<source>Remove %1</source>
- <translation>Fjern %1</translation>
+ <translation>Eemalda %1</translation>
</message>
<message>
<location filename="../src/ui/MainWindow.cpp" line="192"/>
<source>Do you want to permanently remove %1?</source>
- <translation>Vil du fjerne %1 permanent?</translation>
+ <translation>Kas sa tahad tingimata eemaldada: %1?</translation>
</message>
</context>
<context>
@@ -296,37 +304,37 @@
<location filename="../src/ui/qml/MessageDelegate.qml" line="26"/>
<source>%1 is offline</source>
<extracomment>%1 nickname</extracomment>
- <translation>%1 er offline</translation>
+ <translation>%1 on võrgust väljas</translation>
</message>
<message>
<location filename="../src/ui/qml/MessageDelegate.qml" line="135"/>
<source>Copy ID</source>
- <translation>Kopiér ID</translation>
+ <translation>Kopeeri ID</translation>
</message>
<message>
<location filename="../src/ui/qml/MessageDelegate.qml" line="135"/>
<source>Copy Link</source>
- <translation>Kopiér Link</translation>
+ <translation>Kopeeri link</translation>
</message>
<message>
<location filename="../src/ui/qml/MessageDelegate.qml" line="140"/>
<source>Open with Browser</source>
- <translation>Åbn i browser</translation>
+ <translation>Ava koos veebilehitsejaga</translation>
</message>
<message>
<location filename="../src/ui/qml/MessageDelegate.qml" line="154"/>
<source>Add as Contact</source>
- <translation>Tilføj som kontaktperson</translation>
+ <translation>Lisa kontaktina</translation>
</message>
<message>
<location filename="../src/ui/qml/MessageDelegate.qml" line="166"/>
<source>Copy Message</source>
- <translation>Kopiér besked</translation>
+ <translation>Kopeeri sõnum</translation>
</message>
<message>
<location filename="../src/ui/qml/MessageDelegate.qml" line="173"/>
<source>Copy Selection</source>
- <translation>Kopiér markeret tekst</translation>
+ <translation>Kopeeri valik</translation>
</message>
</context>
<context>
@@ -334,18 +342,18 @@
<message>
<location filename="../src/ui/qml/MessageDialogWrapper.qml" line="8"/>
<source>Remove %1</source>
- <translation>Fjern %1</translation>
+ <translation>Eemalda %1</translation>
</message>
<message>
<location filename="../src/ui/qml/MessageDialogWrapper.qml" line="10"/>
<source>Do you want to permanently remove %1?</source>
<extracomment>%1 nickname</extracomment>
- <translation>Vil du fjerne %1 permanent?</translation>
+ <translation>Kas sa tahad tingimata eemaldada %1?</translation>
</message>
<message>
<location filename="../src/ui/qml/MessageDialogWrapper.qml" line="11"/>
<source>This contact will no longer be able to message you, and will be notified about the removal. They may choose to send a new connection request.</source>
- <translation>Denne kontaktperson vil ikke længere være i stand til at sende dig beskeder, og vil blive notificeret om fjernelsen. Kontaktpersonen kan vælge at sende dig en ny kontaktanmodning.</translation>
+ <translation>See kontakt ei saa sulle sõnumeid saata ja on märgitud eemaldamiseks. Kontakt saab saata sulle uue päringu ühendamiseks.</translation>
</message>
</context>
<context>
@@ -353,22 +361,22 @@
<message>
<location filename="../src/ui/qml/NetworkSetupWizard.qml" line="100"/>
<source>This computer's Internet connection is free of obstacles. I would like to connect directly to the Tor network.</source>
- <translation>Denne computers internetadgang er uhindret. Jeg vil gerne forbinde direkte til Tor-netværket.</translation>
+ <translation>Selle arvuti interneti ühendus on vaba takistustest. Tahaksin ühenduda Tor võrku.</translation>
</message>
<message>
<location filename="../src/ui/qml/NetworkSetupWizard.qml" line="107"/>
<source>Connect</source>
- <translation>Forbind</translation>
+ <translation>Ühendus</translation>
</message>
<message>
<location filename="../src/ui/qml/NetworkSetupWizard.qml" line="124"/>
<source>This computer's Internet connection is censored, filtered, or proxied. I need to configure network settings.</source>
- <translation>Denne computers internetadgang er censureret, filtreret eller bag en proxy. Jeg har brug for at konfigurere netværksindstillinger.</translation>
+ <translation>Selle arvuti interneti ühendus on senseeritud, filtreeritud või proksi all. Vajan seadistamaks võrguühendust.</translation>
</message>
<message>
<location filename="../src/ui/qml/NetworkSetupWizard.qml" line="131"/>
<source>Configure</source>
- <translation>Konfigurér</translation>
+ <translation>Seadistus</translation>
</message>
</context>
<context>
@@ -376,23 +384,23 @@
<message>
<location filename="../src/ui/qml/OfflineStateItem.qml" line="107"/>
<source>Configure</source>
- <translation>Konfigurér</translation>
+ <translation>Seadistamine</translation>
</message>
<message>
<location filename="../src/ui/qml/OfflineStateItem.qml" line="115"/>
<source>Details</source>
- <translation>Detaljer</translation>
+ <translation>Detailid</translation>
</message>
<message>
<location filename="../src/ui/qml/OfflineStateItem.qml" line="143"/>
<source>Connection failed</source>
- <translation>Forbindelsen mislykkedes</translation>
+ <translation>Ühenduse viga</translation>
</message>
<message>
<location filename="../src/ui/qml/OfflineStateItem.qml" line="169"/>
<source>Connecting…</source>
<extracomment>\u2026 is ellipsis</extracomment>
- <translation>Forbinder…</translation>
+ <translation>Ühendumine...</translation>
</message>
</context>
<context>
@@ -400,27 +408,27 @@
<message>
<location filename="../src/ui/qml/OpenBrowserDialog.qml" line="40"/>
<source><b>Warning!</b> Opening links with your default browser will harm your security and anonymity.<br><br>You can <a href='.'>copy to the clipboard</a> instead.</source>
- <translation><b>Advarsel!</b> Ved at åbne links med din browser kan du forringe din sikkerhed og anonymitet.<br><br>Du kan <a href='.'>kopiere adressen til clipboardet</a> i stedet.</translation>
+ <translation><b>Hoiatus!</b> Lingi avamine sinu veebilehitsejaga võib vähendada sinu turvalisust ja anonüümsust.<br><br>Sa võid hoopis<a href='.'>kopeerida lõikeväljale</a> .</translation>
</message>
<message>
<location filename="../src/ui/qml/OpenBrowserDialog.qml" line="59"/>
<source>Don't ask again for links from %1</source>
- <translation>Spørg ikke igen om links fra %1</translation>
+ <translation>Ära küsi enam linke %1</translation>
</message>
<message>
<location filename="../src/ui/qml/OpenBrowserDialog.qml" line="65"/>
<source>Don't ask again for any links (not recommended!)</source>
- <translation>Spørg ikke om nogen links (ikke anbefalt!)</translation>
+ <translation>Ära küsi rohkem mitte ühegi linkide kohta (ei ole soovitatud!)</translation>
</message>
<message>
<location filename="../src/ui/qml/OpenBrowserDialog.qml" line="72"/>
<source>Open Browser</source>
- <translation>Åbn Browser</translation>
+ <translation>Ava Brauser</translation>
</message>
<message>
<location filename="../src/ui/qml/OpenBrowserDialog.qml" line="84"/>
<source>Cancel</source>
- <translation>Annullér</translation>
+ <translation>Tühista</translation>
</message>
</context>
<context>
@@ -428,32 +436,31 @@
<message>
<location filename="../src/ui/qml/PreferencesDialog.qml" line="12"/>
<source>Ricochet Preferences</source>
- <translation>Indstillinger for Ricochet</translation>
+ <translation>Ricochet seadistused</translation>
</message>
<message>
<location filename="../src/ui/qml/PreferencesDialog.qml" line="41"/>
<source>General</source>
- <translation>Generelt</translation>
+ <translation>Üldine</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="46"/>
<source>Language</source>
- <translation>Sprog</translation>
+ <translation type="vanished">Keel</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="51"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="46"/>
<source>Contacts</source>
- <translation>Kontaktpersoner</translation>
+ <translation>Kontaktid</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="56"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="51"/>
<source>Tor</source>
<translation>Tor</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="61"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="56"/>
<source>About</source>
- <translation>Om</translation>
+ <translation>Lähemalt</translation>
</message>
</context>
<context>
@@ -461,7 +468,7 @@
<message>
<location filename="../src/ui/qml/MainWindow.qml" line="29"/>
<source>Preference</source>
- <translation>Indstilling</translation>
+ <translation>Eelistused</translation>
</message>
</context>
<context>
@@ -469,12 +476,12 @@
<message>
<location filename="../src/ui/qml/StartupStatusPage.qml" line="18"/>
<source>The Tor process was not started successfully. This is most likely an installation or system error.</source>
- <translation>Tor-processen kunne ikke starte. Dette er sandsynligvis en installations- eller systemfejl.</translation>
+ <translation>Tor protsesside käivitamine ei ole õnnestunud. See on tavaliselt paigaldusel või süsteemiveal.</translation>
</message>
<message>
<location filename="../src/ui/qml/StartupStatusPage.qml" line="49"/>
<source>Quit</source>
- <translation>Afslut</translation>
+ <translation>Lahku</translation>
</message>
</context>
<context>
@@ -483,112 +490,112 @@
<location filename="../src/ui/qml/TorBootstrapStatus.qml" line="17"/>
<source>Connecting to the Tor network…</source>
<extracomment>\u2026 is ellipsis</extracomment>
- <translation>Forbinder til Tor-netværket…</translation>
+ <translation>Ühendumine Tor võrku...</translation>
</message>
<message>
<location filename="../src/ui/qml/TorBootstrapStatus.qml" line="51"/>
<source>Back</source>
- <translation>Tilbage</translation>
+ <translation>Tagasi</translation>
</message>
<message>
<location filename="../src/ui/qml/TorBootstrapStatus.qml" line="58"/>
<source>Hide details</source>
- <translation>Skjul detaljer</translation>
+ <translation>Peida detailid</translation>
</message>
<message>
<location filename="../src/ui/qml/TorBootstrapStatus.qml" line="58"/>
<source>Show details</source>
- <translation>Vis detaljer</translation>
+ <translation>Näita detaile</translation>
</message>
<message>
<location filename="../src/ui/qml/TorBootstrapStatus.qml" line="70"/>
<source>Done</source>
- <translation>Færdig</translation>
+ <translation>Tehtud</translation>
</message>
</context>
<context>
<name>TorConfigurationPage</name>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="72"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="73"/>
<source>Does this computer need a proxy to access the internet?</source>
- <translation>Skal denne computer forbinde gennem en proxy for at tilgå internettet?</translation>
+ <translation>Kas see arvuti vajab interneti ühendamiseks proksit?</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="84"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="85"/>
<source>Proxy type:</source>
- <translation>Proxy type:</translation>
+ <translation>Proksi tüüp:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="89"/>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="91"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="90"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="92"/>
<source>None</source>
- <translation>Ingen</translation>
+ <translation>Ei ole</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="106"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="107"/>
<source>Address:</source>
- <translation>Adresse:</translation>
+ <translation>Aadress:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="115"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="116"/>
<source>IP address or hostname</source>
- <translation>IP-adresse eller værtsnavn</translation>
+ <translation>IP aadress või hostinimi</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="118"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="119"/>
<source>Port:</source>
<translation>Port:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="129"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="130"/>
<source>Username:</source>
- <translation>Brugernavn:</translation>
+ <translation>Kasutajanimi:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="139"/>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="149"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="140"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="150"/>
<source>Optional</source>
- <translation>Valgfrit</translation>
+ <translation>Valikuline</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="142"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="143"/>
<source>Password:</source>
- <translation>Adgangskode:</translation>
+ <translation>Parool:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="159"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="160"/>
<source>Does this computer's Internet connection go through a firewall that only allows connections to certain ports?</source>
- <translation>Går denne computers internetforbindelse gennem en firewall der kun tillader forbindelser på visse porte?</translation>
+ <translation>Kas see arvuti vajab interneti ühenduseks läbi tulemüüri ainult teatuid porte?</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="170"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="171"/>
<source>Allowed ports:</source>
- <translation>Tilladte porte:</translation>
+ <translation>Lubatud pordid:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="177"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="178"/>
<source>Example: 80,443</source>
- <translation>Eksempel: 80,443</translation>
+ <translation>Näide: 80.443</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="188"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="189"/>
<source>If this computer's Internet connection is censored, you will need to obtain and use bridge relays.</source>
- <translation>Hvis denne computers internetforbindelse er censureret, er du nødt til at finde og benytte bridge relæer.</translation>
+ <translation>Kui selle arvuti internetiühendus on senseeritud, siis vajad ja pead saama kasutada sildühendusi.</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="197"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="198"/>
<source>Enter one or more bridge relays (one per line):</source>
- <translation>Indsæt én eller flere bridgerelæer (én per linje):</translation>
+ <translation>Sisesta üks või rohkem sildühendusi (üks rea kohta):</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="212"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="213"/>
<source>Back</source>
- <translation>Tilbage</translation>
+ <translation>Tagasi</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="219"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="220"/>
<source>Connect</source>
- <translation>Forbind</translation>
+ <translation>Ühenda</translation>
</message>
</context>
<context>
@@ -596,67 +603,67 @@
<message>
<location filename="../src/ui/qml/TorPreferences.qml" line="25"/>
<source>Running:</source>
- <translation>Kører:</translation>
+ <translation>Jooksutab:</translation>
</message>
<message>
<location filename="../src/ui/qml/TorPreferences.qml" line="26"/>
<location filename="../src/ui/qml/TorPreferences.qml" line="28"/>
<location filename="../src/ui/qml/TorPreferences.qml" line="30"/>
<source>Yes</source>
- <translation>Ja</translation>
+ <translation>Jah</translation>
</message>
<message>
<location filename="../src/ui/qml/TorPreferences.qml" line="26"/>
<location filename="../src/ui/qml/TorPreferences.qml" line="28"/>
<location filename="../src/ui/qml/TorPreferences.qml" line="30"/>
<source>No</source>
- <translation>Nej</translation>
+ <translation>Ei</translation>
</message>
<message>
<location filename="../src/ui/qml/TorPreferences.qml" line="26"/>
<source>External</source>
- <translation>Ekstern</translation>
+ <translation>Väline</translation>
</message>
<message>
<location filename="../src/ui/qml/TorPreferences.qml" line="27"/>
<source>Control connected:</source>
- <translation>Kontrol forbundet:</translation>
+ <translation>Kontrollitud ühendus:</translation>
</message>
<message>
<location filename="../src/ui/qml/TorPreferences.qml" line="29"/>
<source>Circuits established:</source>
- <translation>Kredsløb etableret:</translation>
+ <translation>Ringühendused kehtestatud:</translation>
</message>
<message>
<location filename="../src/ui/qml/TorPreferences.qml" line="31"/>
<source>Hidden service:</source>
- <translation>Skjult service:</translation>
+ <translation>Peidetud teenus:</translation>
</message>
<message>
<location filename="../src/ui/qml/TorPreferences.qml" line="32"/>
<source>Online</source>
- <translation>Online</translation>
+ <translation>Võrgus</translation>
</message>
<message>
<location filename="../src/ui/qml/TorPreferences.qml" line="32"/>
<source>Offline</source>
- <translation>Offline</translation>
+ <translation>Võrgust väljas</translation>
</message>
<message>
<location filename="../src/ui/qml/TorPreferences.qml" line="33"/>
<source>Version:</source>
- <translation>Version:</translation>
+ <translation>Versioon:</translation>
</message>
<message>
<location filename="../src/ui/qml/TorPreferences.qml" line="60"/>
<source>Error: <b>%1</b></source>
<extracomment>%1 is error message</extracomment>
- <translation>Fejl: <b>%1</b></translation>
+ <translation>Viga: <b>%1</b></translation>
</message>
<message>
<location filename="../src/ui/qml/TorPreferences.qml" line="76"/>
<source>Configure</source>
- <translation>Konfigurér</translation>
+ <translation>Seadistus</translation>
</message>
</context>
<context>
@@ -665,30 +672,30 @@
<location filename="../src/ui/qml/TorStateWidget.qml" line="9"/>
<location filename="../src/ui/qml/TorStateWidget.qml" line="20"/>
<source>Connection failed</source>
- <translation>Forbindelse mislykkedes</translation>
+ <translation>Ühenduse viga</translation>
</message>
<message>
<location filename="../src/ui/qml/TorStateWidget.qml" line="12"/>
<location filename="../src/ui/qml/TorStateWidget.qml" line="22"/>
<source>Connecting…</source>
<extracomment>\u2026 is ellipsis</extracomment>
- <translation>Forbinder…</translation>
+ <translation>Ühendumine...</translation>
</message>
<message>
<location filename="../src/ui/qml/TorStateWidget.qml" line="25"/>
<source>Connecting… (%1%)</source>
<extracomment>%1 is progress percentage, e.g. 100</extracomment>
- <translation>Forbinder… (%1)</translation>
+ <translation>Ühendamine...(%1%)</translation>
</message>
<message>
<location filename="../src/ui/qml/TorStateWidget.qml" line="32"/>
<source>Online</source>
- <translation>Online</translation>
+ <translation>Võrgus</translation>
</message>
<message>
<location filename="../src/ui/qml/TorStateWidget.qml" line="34"/>
<source>Connected</source>
- <translation>Forbundet</translation>
+ <translation>Ühendatud</translation>
</message>
</context>
</TS>
diff --git a/translation/ricochet_fi.ts b/translation/ricochet_fi.ts
index f390a6a..119a47c 100644
--- a/translation/ricochet_fi.ts
+++ b/translation/ricochet_fi.ts
@@ -54,27 +54,27 @@
<context>
<name>ContactIDField</name>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="40"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="41"/>
<source><b>%1</b> is already your contact</source>
<translation><b>%1</b> on jo kontaktisi</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="42"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="43"/>
<source>You can't add yourself as a contact</source>
<translation>Et voi lisätä itseäsi kontaktiksi</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="44"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="45"/>
<source>Enter an ID starting with <b>ricochet:</b></source>
<translation>Anna ID joka alkaa <b>ricochet:</b></translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="80"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="81"/>
<source>Copied to clipboard</source>
<translation>Kopioitu leikepöydälle</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="92"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="93"/>
<source>Copy</source>
<translation>Kopioi</translation>
</message>
@@ -210,37 +210,45 @@
<context>
<name>GeneralPreferences</name>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="12"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="13"/>
<source>Use a single window for conversations</source>
<translation>Käytä yhtä ikkunaa keskusteluille</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="20"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="21"/>
<source>Open links in default browser without prompting</source>
<translation>Avaa linkit oletusselaimella ilman vahvistusta</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="28"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="29"/>
<source>Play audio notifications</source>
<translation>Soita huomioäänimerkkejä</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="37"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="38"/>
<source>Volume</source>
<translation>Äänenvoimakkuus</translation>
</message>
+ <message>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="53"/>
+ <source>Language</source>
+ <translation type="unfinished">Kieli</translation>
+ </message>
+ <message>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="76"/>
+ <source>Restart Ricochet to apply changes</source>
+ <translation type="unfinished">Käynnistä Ricochet uudelleen ottaaksesi tehdyt muutokset käyttöön</translation>
+ </message>
</context>
<context>
<name>LanguagePreferences</name>
<message>
- <location filename="../src/ui/qml/LanguagePreferences.qml" line="22"/>
<source>Select Language</source>
- <translation>Valitse kieli</translation>
+ <translation type="vanished">Valitse kieli</translation>
</message>
<message>
- <location filename="../src/ui/qml/LanguagePreferences.qml" line="52"/>
<source>Restart Ricochet to apply changes</source>
- <translation>Käynnistä Ricochet uudelleen ottaaksesi tehdyt muutokset käyttöön</translation>
+ <translation type="vanished">Käynnistä Ricochet uudelleen ottaaksesi tehdyt muutokset käyttöön</translation>
</message>
</context>
<context>
@@ -254,7 +262,7 @@
<context>
<name>Main</name>
<message>
- <location filename="../src/main.cpp" line="73"/>
+ <location filename="../src/main.cpp" line="81"/>
<source>Ricochet Error</source>
<translation>Ricochetin virhe</translation>
</message>
@@ -436,22 +444,21 @@
<translation>Yleistä</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="46"/>
<source>Language</source>
- <translation>Kieli</translation>
+ <translation type="vanished">Kieli</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="51"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="46"/>
<source>Contacts</source>
<translation>Kontaktit</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="56"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="51"/>
<source>Tor</source>
<translation>Tor</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="61"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="56"/>
<source>About</source>
<translation>Tietoa</translation>
</message>
@@ -509,84 +516,84 @@
<context>
<name>TorConfigurationPage</name>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="72"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="73"/>
<source>Does this computer need a proxy to access the internet?</source>
<translation>Tarvitseeko tämä tietokone välityspalvelimen internet-yhteyden luomista varten?</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="84"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="85"/>
<source>Proxy type:</source>
<translation>Välityspalvelimen tyyppi:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="89"/>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="91"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="90"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="92"/>
<source>None</source>
<translation>Ei mitään</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="106"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="107"/>
<source>Address:</source>
<translation>Osoite:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="115"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="116"/>
<source>IP address or hostname</source>
<translation>IP-osoite tai isäntä:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="118"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="119"/>
<source>Port:</source>
<translation>Portti:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="129"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="130"/>
<source>Username:</source>
<translation>Käyttäjänimi:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="139"/>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="149"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="140"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="150"/>
<source>Optional</source>
<translation>Vaihtoehtoinen</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="142"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="143"/>
<source>Password:</source>
<translation>Salasana:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="159"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="160"/>
<source>Does this computer's Internet connection go through a firewall that only allows connections to certain ports?</source>
<translation>Suojaako tämän tietokoneen internet-yhteyttä palomuuri, joka sallii liikenteen vain ennalta määrätyistä porteista?</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="170"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="171"/>
<source>Allowed ports:</source>
<translation>Sallitut portit:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="177"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="178"/>
<source>Example: 80,443</source>
<translation>Esimerkiksi: 80,443</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="188"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="189"/>
<source>If this computer's Internet connection is censored, you will need to obtain and use bridge relays.</source>
<translation>Jos tämän tietokoneen internet-yhteyttä on sensuroitu, sinun täytyy käyttää sillattuja reitittimiä</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="197"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="198"/>
<source>Enter one or more bridge relays (one per line):</source>
<translation>Anna yksi tai useampi reititin (erottele rivinvaihdolla):</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="212"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="213"/>
<source>Back</source>
<translation>Palaa</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="219"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="220"/>
<source>Connect</source>
<translation>Yhdistä</translation>
</message>
diff --git a/translation/ricochet_fil_PH.ts b/translation/ricochet_fil_PH.ts
index 056e5b8..5f7782c 100644
--- a/translation/ricochet_fil_PH.ts
+++ b/translation/ricochet_fil_PH.ts
@@ -54,27 +54,27 @@
<context>
<name>ContactIDField</name>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="40"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="41"/>
<source><b>%1</b> is already your contact</source>
<translation>Si <b>%1</b> ay nasa iyong mga contact na.</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="42"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="43"/>
<source>You can't add yourself as a contact</source>
<translation>Hindi mo maaaring idagdag ang iyong sarili bilang isang contact</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="44"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="45"/>
<source>Enter an ID starting with <b>ricochet:</b></source>
<translation>Magpasok ng isang ID na nagsisimula sa <b>ricochet:</ b></translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="80"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="81"/>
<source>Copied to clipboard</source>
<translation>Kinopya sa clipboard</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="92"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="93"/>
<source>Copy</source>
<translation>Kopyahin</translation>
</message>
@@ -210,35 +210,32 @@
<context>
<name>GeneralPreferences</name>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="12"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="13"/>
<source>Use a single window for conversations</source>
<translation>Gumamit ng solong window para sa mga pag-uusap</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="20"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="21"/>
<source>Open links in default browser without prompting</source>
<translation>Buksan ang mga link sa default na browser nang walang pagdikta</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="28"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="29"/>
<source>Play audio notifications</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="37"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="38"/>
<source>Volume</source>
<translation type="unfinished"></translation>
</message>
-</context>
-<context>
- <name>LanguagePreferences</name>
<message>
- <location filename="../src/ui/qml/LanguagePreferences.qml" line="22"/>
- <source>Select Language</source>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="53"/>
+ <source>Language</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/ui/qml/LanguagePreferences.qml" line="52"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="76"/>
<source>Restart Ricochet to apply changes</source>
<translation type="unfinished"></translation>
</message>
@@ -254,7 +251,7 @@
<context>
<name>Main</name>
<message>
- <location filename="../src/main.cpp" line="73"/>
+ <location filename="../src/main.cpp" line="81"/>
<source>Ricochet Error</source>
<translation>Pagkakamali sa Ricochet</translation>
</message>
@@ -438,21 +435,16 @@
</message>
<message>
<location filename="../src/ui/qml/PreferencesDialog.qml" line="46"/>
- <source>Language</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="51"/>
<source>Contacts</source>
<translation>Mga Contact</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="56"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="51"/>
<source>Tor</source>
<translation>Tor</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="61"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="56"/>
<source>About</source>
<translation>Patungkol</translation>
</message>
@@ -510,84 +502,84 @@
<context>
<name>TorConfigurationPage</name>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="72"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="73"/>
<source>Does this computer need a proxy to access the internet?</source>
<translation>Kailangan ba ng computer na ito ng proxy upang ma-access ang internet?</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="84"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="85"/>
<source>Proxy type:</source>
<translation>Uri ng Proxy:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="89"/>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="91"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="90"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="92"/>
<source>None</source>
<translation>Wala</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="106"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="107"/>
<source>Address:</source>
<translation>Address:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="115"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="116"/>
<source>IP address or hostname</source>
<translation>IP address o hostname</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="118"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="119"/>
<source>Port:</source>
<translation>Port:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="129"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="130"/>
<source>Username:</source>
<translation>Username:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="139"/>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="149"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="140"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="150"/>
<source>Optional</source>
<translation>Opsyonal</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="142"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="143"/>
<source>Password:</source>
<translation>Password:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="159"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="160"/>
<source>Does this computer's Internet connection go through a firewall that only allows connections to certain ports?</source>
<translation>Pumupunta ba ang koneksyon sa Internet ng computer na ito sa pamamagitan ng isang firewall na nagbibigay-daan lamang ng mga koneksyon sa ilang mga ports?</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="170"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="171"/>
<source>Allowed ports:</source>
<translation>Pinayagan na ports:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="177"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="178"/>
<source>Example: 80,443</source>
<translation>Halimbawa: 80, 443</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="188"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="189"/>
<source>If this computer's Internet connection is censored, you will need to obtain and use bridge relays.</source>
<translation>Kung ang koneksyon sa Internet ng computer na ito ay censored, kakailanganin mo na makuha at gumamit ng bridge relays.</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="197"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="198"/>
<source>Enter one or more bridge relays (one per line):</source>
<translation>Magpasok ng isa o higit pang mga bridge relays (isa bawat linya):</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="212"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="213"/>
<source>Back</source>
<translation>Bumalik</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="219"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="220"/>
<source>Connect</source>
<translation>Kumonekta</translation>
</message>
diff --git a/translation/ricochet_fr.ts b/translation/ricochet_fr.ts
index 0891f75..0f33d46 100644
--- a/translation/ricochet_fr.ts
+++ b/translation/ricochet_fr.ts
@@ -54,27 +54,27 @@
<context>
<name>ContactIDField</name>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="40"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="41"/>
<source><b>%1</b> is already your contact</source>
<translation><b>%1</b> est déjà votre contact</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="42"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="43"/>
<source>You can't add yourself as a contact</source>
<translation>Vous ne pouvez pas vous ajouter vous-même en tant que contact</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="44"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="45"/>
<source>Enter an ID starting with <b>ricochet:</b></source>
<translation>Entrez un ID commençant par <b>ricochet:</b></translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="80"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="81"/>
<source>Copied to clipboard</source>
<translation>Copié dans le presse-papier</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="92"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="93"/>
<source>Copy</source>
<translation>Copier</translation>
</message>
@@ -210,37 +210,45 @@
<context>
<name>GeneralPreferences</name>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="12"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="13"/>
<source>Use a single window for conversations</source>
<translation>Utiliser une seule fenêtre pour les conversations</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="20"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="21"/>
<source>Open links in default browser without prompting</source>
<translation>Ouvrir les hyperliens directement dans le navigateur par défaut sans demander à chaque fois</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="28"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="29"/>
<source>Play audio notifications</source>
<translation>Jouer les notifications sonores</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="37"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="38"/>
<source>Volume</source>
<translation>Volume</translation>
</message>
+ <message>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="53"/>
+ <source>Language</source>
+ <translation type="unfinished">Langue</translation>
+ </message>
+ <message>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="76"/>
+ <source>Restart Ricochet to apply changes</source>
+ <translation type="unfinished">Redémarrer l'application pour applique les modifications</translation>
+ </message>
</context>
<context>
<name>LanguagePreferences</name>
<message>
- <location filename="../src/ui/qml/LanguagePreferences.qml" line="22"/>
<source>Select Language</source>
- <translation>Choisir la langue</translation>
+ <translation type="vanished">Choisir la langue</translation>
</message>
<message>
- <location filename="../src/ui/qml/LanguagePreferences.qml" line="52"/>
<source>Restart Ricochet to apply changes</source>
- <translation>Redémarrer l'application pour applique les modifications</translation>
+ <translation type="vanished">Redémarrer l'application pour applique les modifications</translation>
</message>
</context>
<context>
@@ -254,7 +262,7 @@
<context>
<name>Main</name>
<message>
- <location filename="../src/main.cpp" line="73"/>
+ <location filename="../src/main.cpp" line="81"/>
<source>Ricochet Error</source>
<translation>Erreur de Ricochet</translation>
</message>
@@ -436,22 +444,21 @@
<translation>Général</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="46"/>
<source>Language</source>
- <translation>Langue</translation>
+ <translation type="vanished">Langue</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="51"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="46"/>
<source>Contacts</source>
<translation>Contacts</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="56"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="51"/>
<source>Tor</source>
<translation>Tor</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="61"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="56"/>
<source>About</source>
<translation>À propos</translation>
</message>
@@ -509,84 +516,84 @@
<context>
<name>TorConfigurationPage</name>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="72"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="73"/>
<source>Does this computer need a proxy to access the internet?</source>
<translation>Est-ce que cet ordinateur à besoin d'un proxy pour accéder à Internet ?</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="84"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="85"/>
<source>Proxy type:</source>
<translation>Type de proxy :</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="89"/>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="91"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="90"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="92"/>
<source>None</source>
<translation>Aucun</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="106"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="107"/>
<source>Address:</source>
<translation>Adresse : </translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="115"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="116"/>
<source>IP address or hostname</source>
<translation>Adresse IP ou nom d'hôte</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="118"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="119"/>
<source>Port:</source>
<translation>Port : </translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="129"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="130"/>
<source>Username:</source>
<translation>Nom d'utilisateur : </translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="139"/>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="149"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="140"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="150"/>
<source>Optional</source>
<translation>En option</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="142"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="143"/>
<source>Password:</source>
<translation>Mot de passe : </translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="159"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="160"/>
<source>Does this computer's Internet connection go through a firewall that only allows connections to certain ports?</source>
<translation>Est-ce que la connexion Internet de cet ordinateur passe à travers un pare-feu qui autorise uniquement les connexions à certains ports ?</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="170"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="171"/>
<source>Allowed ports:</source>
<translation>Ports autorisés :</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="177"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="178"/>
<source>Example: 80,443</source>
<translation>Exemple : 80,443</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="188"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="189"/>
<source>If this computer's Internet connection is censored, you will need to obtain and use bridge relays.</source>
<translation>Si la connexion Internet de cet ordinateur est censurée, vous allez devoir obtenir et utiliser un pont Tor.</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="197"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="198"/>
<source>Enter one or more bridge relays (one per line):</source>
<translation>Entrez un ou plusieurs ponts Tor (un par ligne) :</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="212"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="213"/>
<source>Back</source>
<translation>Retour</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="219"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="220"/>
<source>Connect</source>
<translation>Connexion</translation>
</message>
diff --git a/translation/ricochet_he.ts b/translation/ricochet_he.ts
index 00cf4e8..379b8b2 100644
--- a/translation/ricochet_he.ts
+++ b/translation/ricochet_he.ts
@@ -1,4 +1,6 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="he" version="2.1">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="he">
<context>
<name>AboutPreferences</name>
<message>
@@ -52,27 +54,27 @@
<context>
<name>ContactIDField</name>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="40"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="41"/>
<source><b>%1</b> is already your contact</source>
<translation><b>%1</b> הינו איש קשר קיים</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="42"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="43"/>
<source>You can't add yourself as a contact</source>
<translation>אי אפשר להוסיף עצמך לאנשי קשר</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="44"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="45"/>
<source>Enter an ID starting with <b>ricochet:</b></source>
<translation>הכנס שם משתמש אשר מתחיל ב <b>ricochet:</b></translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="79"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="81"/>
<source>Copied to clipboard</source>
<translation>הועתק ללוח</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="91"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="93"/>
<source>Copy</source>
<translation>העתק</translation>
</message>
@@ -80,27 +82,27 @@
<context>
<name>ContactList</name>
<message>
- <location filename="../src/ui/qml/ContactList.qml" line="75"/>
+ <location filename="../src/ui/qml/ContactList.qml" line="76"/>
<source>Online</source>
<translation>מחובר</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactList.qml" line="76"/>
+ <location filename="../src/ui/qml/ContactList.qml" line="77"/>
<source>Offline</source>
<translation>מנותק</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactList.qml" line="77"/>
+ <location filename="../src/ui/qml/ContactList.qml" line="78"/>
<source>Requests</source>
<translation>בקשות</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactList.qml" line="78"/>
+ <location filename="../src/ui/qml/ContactList.qml" line="79"/>
<source>Rejected</source>
<translation>קשרים שנדחו</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactList.qml" line="79"/>
+ <location filename="../src/ui/qml/ContactList.qml" line="80"/>
<source>Outdated</source>
<translation>אינו בתוקף</translation>
</message>
@@ -108,63 +110,63 @@
<context>
<name>ContactPreferences</name>
<message>
- <location filename="../src/ui/qml/ContactPreferences.qml" line="97"/>
+ <location filename="../src/ui/qml/ContactPreferences.qml" line="98"/>
<source>Date added:</source>
<translation>הוסף בתאריך</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactPreferences.qml" line="104"/>
+ <location filename="../src/ui/qml/ContactPreferences.qml" line="106"/>
<source>Last seen:</source>
<translation>נראה לאחרונה</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactPreferences.qml" line="113"/>
+ <location filename="../src/ui/qml/ContactPreferences.qml" line="116"/>
<source>Request:</source>
<translation>בקשה:</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactPreferences.qml" line="122"/>
+ <location filename="../src/ui/qml/ContactPreferences.qml" line="126"/>
<source>Pending connection</source>
<translation>חיבורים ממתינים לאישור</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactPreferences.qml" line="123"/>
+ <location filename="../src/ui/qml/ContactPreferences.qml" line="127"/>
<source>Delivered</source>
<translation>נשלח</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactPreferences.qml" line="124"/>
+ <location filename="../src/ui/qml/ContactPreferences.qml" line="128"/>
<source>Accepted</source>
<translation>התקבל</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactPreferences.qml" line="125"/>
+ <location filename="../src/ui/qml/ContactPreferences.qml" line="129"/>
<source>Error</source>
<translation>שגיאה</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactPreferences.qml" line="126"/>
+ <location filename="../src/ui/qml/ContactPreferences.qml" line="130"/>
<source>Rejected</source>
<translation>קשרים שנדחו</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactPreferences.qml" line="130"/>
+ <location filename="../src/ui/qml/ContactPreferences.qml" line="134"/>
<source>%1 (Connected)</source>
<extracomment>%1 status, e.g. "Accepted"</extracomment>
<translation>%1 (מחובר)</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactPreferences.qml" line="136"/>
+ <location filename="../src/ui/qml/ContactPreferences.qml" line="140"/>
<source>Response:</source>
<translation>תגובה:</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactPreferences.qml" line="158"/>
+ <location filename="../src/ui/qml/ContactPreferences.qml" line="163"/>
<source>Rename</source>
<translation>שנה שם</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactPreferences.qml" line="165"/>
+ <location filename="../src/ui/qml/ContactPreferences.qml" line="170"/>
<source>Remove</source>
<translation>הסר</translation>
</message>
@@ -208,37 +210,45 @@
<context>
<name>GeneralPreferences</name>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="12"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="13"/>
<source>Use a single window for conversations</source>
<translation>השתמש בחלון בודד עבור כל השיחות</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="20"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="21"/>
<source>Open links in default browser without prompting</source>
<translation>פתח קישורים בדפדפן ברירת המחדל ללא בקשת אישור</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="28"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="29"/>
<source>Play audio notifications</source>
<translation>השמע התראה קולית</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="37"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="38"/>
<source>Volume</source>
<translation>עוצמה</translation>
</message>
+ <message>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="53"/>
+ <source>Language</source>
+ <translation type="unfinished">שפה</translation>
+ </message>
+ <message>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="76"/>
+ <source>Restart Ricochet to apply changes</source>
+ <translation type="unfinished">הפעל מחדש את האפליקציה על מנת לעדכן את ההגדרות החדשות</translation>
+ </message>
</context>
<context>
<name>LanguagePreferences</name>
<message>
- <location filename="../src/ui/qml/LanguagePreferences.qml" line="22"/>
<source>Select Language</source>
- <translation>בחר שפה</translation>
+ <translation type="vanished">בחר שפה</translation>
</message>
<message>
- <location filename="../src/ui/qml/LanguagePreferences.qml" line="52"/>
<source>Restart Ricochet to apply changes</source>
- <translation>הפעל מחדש את האפליקציה על מנת לעדכן את ההגדרות החדשות</translation>
+ <translation type="vanished">הפעל מחדש את האפליקציה על מנת לעדכן את ההגדרות החדשות</translation>
</message>
</context>
<context>
@@ -252,7 +262,7 @@
<context>
<name>Main</name>
<message>
- <location filename="../src/main.cpp" line="73"/>
+ <location filename="../src/main.cpp" line="81"/>
<source>Ricochet Error</source>
<translation>שגיאה ב Ricochet</translation>
</message>
@@ -278,12 +288,12 @@
<context>
<name>MainWindow</name>
<message>
- <location filename="../src/ui/MainWindow.cpp" line="153"/>
+ <location filename="../src/ui/MainWindow.cpp" line="191"/>
<source>Remove %1</source>
<translation>הסר את %1</translation>
</message>
<message>
- <location filename="../src/ui/MainWindow.cpp" line="154"/>
+ <location filename="../src/ui/MainWindow.cpp" line="192"/>
<source>Do you want to permanently remove %1?</source>
<translation>האם אתה רוצה להסיר לצמיתות את %1</translation>
</message>
@@ -297,32 +307,32 @@
<translation>%1 מנותק</translation>
</message>
<message>
- <location filename="../src/ui/qml/MessageDelegate.qml" line="134"/>
+ <location filename="../src/ui/qml/MessageDelegate.qml" line="135"/>
<source>Copy ID</source>
<translation>העתק זהות</translation>
</message>
<message>
- <location filename="../src/ui/qml/MessageDelegate.qml" line="134"/>
+ <location filename="../src/ui/qml/MessageDelegate.qml" line="135"/>
<source>Copy Link</source>
<translation>העתק לינק</translation>
</message>
<message>
- <location filename="../src/ui/qml/MessageDelegate.qml" line="139"/>
+ <location filename="../src/ui/qml/MessageDelegate.qml" line="140"/>
<source>Open with Browser</source>
<translation>פתח בדפדפן</translation>
</message>
<message>
- <location filename="../src/ui/qml/MessageDelegate.qml" line="153"/>
+ <location filename="../src/ui/qml/MessageDelegate.qml" line="154"/>
<source>Add as Contact</source>
<translation>הוסיף כאיש קשר</translation>
</message>
<message>
- <location filename="../src/ui/qml/MessageDelegate.qml" line="165"/>
+ <location filename="../src/ui/qml/MessageDelegate.qml" line="166"/>
<source>Copy Message</source>
<translation>העתק הודעה</translation>
</message>
<message>
- <location filename="../src/ui/qml/MessageDelegate.qml" line="172"/>
+ <location filename="../src/ui/qml/MessageDelegate.qml" line="173"/>
<source>Copy Selection</source>
<translation>העתק בחירה</translation>
</message>
@@ -330,18 +340,18 @@
<context>
<name>MessageDialogWrapper</name>
<message>
- <location filename="../src/ui/qml/MessageDialogWrapper.qml" line="7"/>
+ <location filename="../src/ui/qml/MessageDialogWrapper.qml" line="8"/>
<source>Remove %1</source>
<translation>הסר את %1</translation>
</message>
<message>
- <location filename="../src/ui/qml/MessageDialogWrapper.qml" line="9"/>
+ <location filename="../src/ui/qml/MessageDialogWrapper.qml" line="10"/>
<source>Do you want to permanently remove %1?</source>
<extracomment>%1 nickname</extracomment>
<translation>האם אתה רוצה להסיר לצמיתות את %1</translation>
</message>
<message>
- <location filename="../src/ui/qml/MessageDialogWrapper.qml" line="10"/>
+ <location filename="../src/ui/qml/MessageDialogWrapper.qml" line="11"/>
<source>This contact will no longer be able to message you, and will be notified about the removal. They may choose to send a new connection request.</source>
<translation>איש הקשר לא יהיה מסוגל לשלוח לך הודעות, הצד השני יקבל התראה על הסרת הקישור ביניכם. הם יוכלו לשלוח בקשת חיבור מחדש</translation>
</message>
@@ -396,27 +406,27 @@
<context>
<name>OpenBrowserDialog</name>
<message>
- <location filename="../src/ui/qml/OpenBrowserDialog.qml" line="39"/>
+ <location filename="../src/ui/qml/OpenBrowserDialog.qml" line="40"/>
<source><b>Warning!</b> Opening links with your default browser will harm your security and anonymity.<br><br>You can <a href='.'>copy to the clipboard</a> instead.</source>
<translation><b>זהירות!</b> פתיחת קישורים עם דפדפן הברירת מחדל שלך עלולה לסכן אותך ולחשוף פרטים עלייך!<br><br>תוכל במקום <a href=".">להעתיק את הקישור</a> ללוח.</translation>
</message>
<message>
- <location filename="../src/ui/qml/OpenBrowserDialog.qml" line="58"/>
+ <location filename="../src/ui/qml/OpenBrowserDialog.qml" line="59"/>
<source>Don't ask again for links from %1</source>
<translation>אין צורך לבקש אישור פתיחה נוסף מ %1</translation>
</message>
<message>
- <location filename="../src/ui/qml/OpenBrowserDialog.qml" line="64"/>
+ <location filename="../src/ui/qml/OpenBrowserDialog.qml" line="65"/>
<source>Don't ask again for any links (not recommended!)</source>
<translation>אין צורך לבקש אישור מאף איש קשר (לא מומלץ ומסוכן!)</translation>
</message>
<message>
- <location filename="../src/ui/qml/OpenBrowserDialog.qml" line="71"/>
+ <location filename="../src/ui/qml/OpenBrowserDialog.qml" line="72"/>
<source>Open Browser</source>
<translation>פתח דפדפן</translation>
</message>
<message>
- <location filename="../src/ui/qml/OpenBrowserDialog.qml" line="83"/>
+ <location filename="../src/ui/qml/OpenBrowserDialog.qml" line="84"/>
<source>Cancel</source>
<translation>בטל</translation>
</message>
@@ -434,22 +444,21 @@
<translation>כללי</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="46"/>
<source>Language</source>
- <translation>שפה</translation>
+ <translation type="vanished">שפה</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="51"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="46"/>
<source>Contacts</source>
<translation>אנשי קשר</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="56"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="51"/>
<source>Tor</source>
<translation>Tor</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="61"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="56"/>
<source>About</source>
<translation>אודות</translation>
</message>
@@ -484,22 +493,22 @@
<translation>מתחבר לרשת Tor</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorBootstrapStatus.qml" line="50"/>
+ <location filename="../src/ui/qml/TorBootstrapStatus.qml" line="51"/>
<source>Back</source>
<translation>אחורה</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorBootstrapStatus.qml" line="57"/>
+ <location filename="../src/ui/qml/TorBootstrapStatus.qml" line="58"/>
<source>Hide details</source>
<translation>הסתר פרטים</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorBootstrapStatus.qml" line="57"/>
+ <location filename="../src/ui/qml/TorBootstrapStatus.qml" line="58"/>
<source>Show details</source>
<translation>הראה פרטים</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorBootstrapStatus.qml" line="69"/>
+ <location filename="../src/ui/qml/TorBootstrapStatus.qml" line="70"/>
<source>Done</source>
<translation>סיום</translation>
</message>
@@ -507,84 +516,84 @@
<context>
<name>TorConfigurationPage</name>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="72"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="73"/>
<source>Does this computer need a proxy to access the internet?</source>
<translation>האם מחשב זה משתמש בפרוקסי על מנת להתחבר לאינטרנט?</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="84"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="85"/>
<source>Proxy type:</source>
<translation>סוג פרוקסי</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="89"/>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="91"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="90"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="92"/>
<source>None</source>
<translation>ללא</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="106"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="107"/>
<source>Address:</source>
<translation>כתובת:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="115"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="116"/>
<source>IP address or hostname</source>
<translation>כתובת IP או שם מחשב מארח</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="118"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="119"/>
<source>Port:</source>
<translation>פורט:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="129"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="130"/>
<source>Username:</source>
<translation>שם משתמש:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="139"/>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="149"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="140"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="150"/>
<source>Optional</source>
<translation>אופציונלי</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="142"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="143"/>
<source>Password:</source>
<translation>סיסמה:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="159"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="160"/>
<source>Does this computer's Internet connection go through a firewall that only allows connections to certain ports?</source>
<translation>האם חיבור של מחשב זה עובר דרך חומת אש אשר מרשה שימוש בפורטים מסויימים?</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="170"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="171"/>
<source>Allowed ports:</source>
<translation>פורטים מורשים:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="177"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="178"/>
<source>Example: 80,443</source>
<translation>דוגמה: 80,443</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="188"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="189"/>
<source>If this computer's Internet connection is censored, you will need to obtain and use bridge relays.</source>
<translation>במידה וחיבור האינטרנט של מחשב זה מצונזר, יהיה עליך להגדיר שרתי גישור חיבור</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="197"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="198"/>
<source>Enter one or more bridge relays (one per line):</source>
<translation>הכנס גשר חיבור (אחד לשורה):</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="212"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="213"/>
<source>Back</source>
<translation>חזרה</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="219"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="220"/>
<source>Connect</source>
<translation>התחברהתחבר</translation>
</message>
@@ -592,67 +601,67 @@
<context>
<name>TorPreferences</name>
<message>
- <location filename="../src/ui/qml/TorPreferences.qml" line="24"/>
+ <location filename="../src/ui/qml/TorPreferences.qml" line="25"/>
<source>Running:</source>
<translation>פעיל:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorPreferences.qml" line="25"/>
- <location filename="../src/ui/qml/TorPreferences.qml" line="27"/>
- <location filename="../src/ui/qml/TorPreferences.qml" line="29"/>
+ <location filename="../src/ui/qml/TorPreferences.qml" line="26"/>
+ <location filename="../src/ui/qml/TorPreferences.qml" line="28"/>
+ <location filename="../src/ui/qml/TorPreferences.qml" line="30"/>
<source>Yes</source>
<translation>כן</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorPreferences.qml" line="25"/>
- <location filename="../src/ui/qml/TorPreferences.qml" line="27"/>
- <location filename="../src/ui/qml/TorPreferences.qml" line="29"/>
+ <location filename="../src/ui/qml/TorPreferences.qml" line="26"/>
+ <location filename="../src/ui/qml/TorPreferences.qml" line="28"/>
+ <location filename="../src/ui/qml/TorPreferences.qml" line="30"/>
<source>No</source>
<translation>לא</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorPreferences.qml" line="25"/>
+ <location filename="../src/ui/qml/TorPreferences.qml" line="26"/>
<source>External</source>
<translation>חיצוני</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorPreferences.qml" line="26"/>
+ <location filename="../src/ui/qml/TorPreferences.qml" line="27"/>
<source>Control connected:</source>
<translation>בקרה מחוברת:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorPreferences.qml" line="28"/>
+ <location filename="../src/ui/qml/TorPreferences.qml" line="29"/>
<source>Circuits established:</source>
<translation>מעגלים מחוברים:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorPreferences.qml" line="30"/>
+ <location filename="../src/ui/qml/TorPreferences.qml" line="31"/>
<source>Hidden service:</source>
<translation>שירות מוסתר:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorPreferences.qml" line="31"/>
+ <location filename="../src/ui/qml/TorPreferences.qml" line="32"/>
<source>Online</source>
<translation>מחובר</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorPreferences.qml" line="31"/>
+ <location filename="../src/ui/qml/TorPreferences.qml" line="32"/>
<source>Offline</source>
<translation>מנותק</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorPreferences.qml" line="32"/>
+ <location filename="../src/ui/qml/TorPreferences.qml" line="33"/>
<source>Version:</source>
<translation>גירסה:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorPreferences.qml" line="59"/>
+ <location filename="../src/ui/qml/TorPreferences.qml" line="60"/>
<source>Error: <b>%1</b></source>
<extracomment>%1 is error message</extracomment>
<translation>שגיאה: <b>%1</b></translation>
</message>
<message>
- <location filename="../src/ui/qml/TorPreferences.qml" line="75"/>
+ <location filename="../src/ui/qml/TorPreferences.qml" line="76"/>
<source>Configure</source>
<translation>הגדר</translation>
</message>
@@ -689,4 +698,4 @@
<translation>מחובר</translation>
</message>
</context>
-</TS>
\ No newline at end of file
+</TS>
diff --git a/translation/ricochet_it.ts b/translation/ricochet_it.ts
index f9aa542..9f9a8bf 100644
--- a/translation/ricochet_it.ts
+++ b/translation/ricochet_it.ts
@@ -54,27 +54,27 @@
<context>
<name>ContactIDField</name>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="40"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="41"/>
<source><b>%1</b> is already your contact</source>
<translation><b>%1</b> è già un tuo contatto</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="42"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="43"/>
<source>You can't add yourself as a contact</source>
<translation>Non puoi aggiungere te stesso come contatto</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="44"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="45"/>
<source>Enter an ID starting with <b>ricochet:</b></source>
<translation>Inserisci un ID che inizi con <b>ricochet:</b></translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="80"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="81"/>
<source>Copied to clipboard</source>
<translation>Copiato negli appunti</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="92"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="93"/>
<source>Copy</source>
<translation>Copia</translation>
</message>
@@ -210,37 +210,45 @@
<context>
<name>GeneralPreferences</name>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="12"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="13"/>
<source>Use a single window for conversations</source>
<translation>Usa una finestra singola per le conversazioni</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="20"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="21"/>
<source>Open links in default browser without prompting</source>
<translation>Apri link nel browser di default senza chiedere</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="28"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="29"/>
<source>Play audio notifications</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="37"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="38"/>
<source>Volume</source>
<translation>Volume</translation>
</message>
+ <message>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="53"/>
+ <source>Language</source>
+ <translation type="unfinished">Lingua</translation>
+ </message>
+ <message>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="76"/>
+ <source>Restart Ricochet to apply changes</source>
+ <translation type="unfinished">Riavvia Ricochet per applicare le modifiche</translation>
+ </message>
</context>
<context>
<name>LanguagePreferences</name>
<message>
- <location filename="../src/ui/qml/LanguagePreferences.qml" line="22"/>
<source>Select Language</source>
- <translation>Selezione lingua</translation>
+ <translation type="vanished">Selezione lingua</translation>
</message>
<message>
- <location filename="../src/ui/qml/LanguagePreferences.qml" line="52"/>
<source>Restart Ricochet to apply changes</source>
- <translation>Riavvia Ricochet per applicare le modifiche</translation>
+ <translation type="vanished">Riavvia Ricochet per applicare le modifiche</translation>
</message>
</context>
<context>
@@ -254,7 +262,7 @@
<context>
<name>Main</name>
<message>
- <location filename="../src/main.cpp" line="73"/>
+ <location filename="../src/main.cpp" line="81"/>
<source>Ricochet Error</source>
<translation>Errore Ricochet</translation>
</message>
@@ -436,22 +444,21 @@
<translation>Generali</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="46"/>
<source>Language</source>
- <translation>Lingua</translation>
+ <translation type="vanished">Lingua</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="51"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="46"/>
<source>Contacts</source>
<translation>Contatti</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="56"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="51"/>
<source>Tor</source>
<translation>Tor</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="61"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="56"/>
<source>About</source>
<translation>Riguardo a </translation>
</message>
@@ -509,84 +516,84 @@
<context>
<name>TorConfigurationPage</name>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="72"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="73"/>
<source>Does this computer need a proxy to access the internet?</source>
<translation>Questo computer necessita di un proxy per accedere a internet?</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="84"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="85"/>
<source>Proxy type:</source>
<translation>Tipo di proxy:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="89"/>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="91"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="90"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="92"/>
<source>None</source>
<translation>Nessuno</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="106"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="107"/>
<source>Address:</source>
<translation>Indirizzo:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="115"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="116"/>
<source>IP address or hostname</source>
<translation>Indirizzo IP o nome host</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="118"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="119"/>
<source>Port:</source>
<translation>Porta:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="129"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="130"/>
<source>Username:</source>
<translation>Nome utente:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="139"/>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="149"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="140"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="150"/>
<source>Optional</source>
<translation>Opzionale</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="142"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="143"/>
<source>Password:</source>
<translation>Password:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="159"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="160"/>
<source>Does this computer's Internet connection go through a firewall that only allows connections to certain ports?</source>
<translation>La connessione di questo computer passa attraverso un firewall che permette la connessione solo ad alcune porte?</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="170"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="171"/>
<source>Allowed ports:</source>
<translation>Porte permesse:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="177"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="178"/>
<source>Example: 80,443</source>
<translation>Esempio: 80,443</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="188"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="189"/>
<source>If this computer's Internet connection is censored, you will need to obtain and use bridge relays.</source>
<translation>Se la connessione a internet di questo computer è censurata dovrai ottenere ed usare dei bridge relay</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="197"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="198"/>
<source>Enter one or more bridge relays (one per line):</source>
<translation>Inserisci uno o più bridge relay (uno per linea):</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="212"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="213"/>
<source>Back</source>
<translation>Indietro</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="219"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="220"/>
<source>Connect</source>
<translation>Collegare</translation>
</message>
diff --git a/translation/ricochet_it.ts b/translation/ricochet_it_IT.ts
similarity index 83%
copy from translation/ricochet_it.ts
copy to translation/ricochet_it_IT.ts
index f9aa542..7d6a3a0 100644
--- a/translation/ricochet_it.ts
+++ b/translation/ricochet_it_IT.ts
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
-<TS version="2.1" language="it">
+<TS version="2.1" language="it_IT">
<context>
<name>AboutPreferences</name>
<message>
@@ -15,7 +15,7 @@
<message>
<location filename="../src/ui/qml/AddContactDialog.qml" line="51"/>
<source>Share your Ricochet ID to allow connection requests</source>
- <translation>Condividi il tuo Ricochet ID per permettere le richieste di connessione</translation>
+ <translation>Condividi il tuo Ricochet ID per permettere agli altri utenti di inviarti richieste di connessione</translation>
</message>
<message>
<location filename="../src/ui/qml/AddContactDialog.qml" line="107"/>
@@ -25,7 +25,7 @@
<message>
<location filename="../src/ui/qml/AddContactDialog.qml" line="112"/>
<source>Add</source>
- <translation>Aggiungere</translation>
+ <translation>Aggiungi</translation>
</message>
</context>
<context>
@@ -33,7 +33,7 @@
<message>
<location filename="../src/ui/qml/ContactActions.qml" line="40"/>
<source>Open Window</source>
- <translation>Apri Finestra</translation>
+ <translation>Apri finestra</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactActions.qml" line="44"/>
@@ -43,38 +43,38 @@
<message>
<location filename="../src/ui/qml/ContactActions.qml" line="48"/>
<source>Rename</source>
- <translation>Rinominare</translation>
+ <translation>Rinomina</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactActions.qml" line="53"/>
<source>Remove</source>
- <translation>Rimuovere</translation>
+ <translation>Rimuovi</translation>
</message>
</context>
<context>
<name>ContactIDField</name>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="40"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="41"/>
<source><b>%1</b> is already your contact</source>
- <translation><b>%1</b> è già un tuo contatto</translation>
+ <translation><b>%1</b> è già tra i tuoi contatti</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="42"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="43"/>
<source>You can't add yourself as a contact</source>
- <translation>Non puoi aggiungere te stesso come contatto</translation>
+ <translation>Non puoi aggiungere te stesso ai tuoi contatti</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="44"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="45"/>
<source>Enter an ID starting with <b>ricochet:</b></source>
<translation>Inserisci un ID che inizi con <b>ricochet:</b></translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="80"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="81"/>
<source>Copied to clipboard</source>
<translation>Copiato negli appunti</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="92"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="93"/>
<source>Copy</source>
<translation>Copia</translation>
</message>
@@ -104,7 +104,7 @@
<message>
<location filename="../src/ui/qml/ContactList.qml" line="80"/>
<source>Outdated</source>
- <translation type="unfinished"></translation>
+ <translation>Non aggiornato</translation>
</message>
</context>
<context>
@@ -112,7 +112,7 @@
<message>
<location filename="../src/ui/qml/ContactPreferences.qml" line="98"/>
<source>Date added:</source>
- <translation>Data di inserimento:</translation>
+ <translation>Aggiunto il:</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactPreferences.qml" line="106"/>
@@ -127,7 +127,7 @@
<message>
<location filename="../src/ui/qml/ContactPreferences.qml" line="126"/>
<source>Pending connection</source>
- <translation>Connessione in sospeso</translation>
+ <translation>Connessione in attesa</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactPreferences.qml" line="127"/>
@@ -153,7 +153,7 @@
<location filename="../src/ui/qml/ContactPreferences.qml" line="134"/>
<source>%1 (Connected)</source>
<extracomment>%1 status, e.g. "Accepted"</extracomment>
- <translation>%1 (Collegato)</translation>
+ <translation>%1 (In linea)</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactPreferences.qml" line="140"/>
@@ -168,7 +168,7 @@
<message>
<location filename="../src/ui/qml/ContactPreferences.qml" line="170"/>
<source>Remove</source>
- <translation>Rimuovere</translation>
+ <translation>Rimuovi</translation>
</message>
</context>
<context>
@@ -176,7 +176,7 @@
<message>
<location filename="../src/ui/qml/ContactRequestDialog.qml" line="55"/>
<source>Someone new is asking to connect to you</source>
- <translation>Qualcuno di nuovo sta chiedendo di connettersi a te</translation>
+ <translation>Un nuovo utente vuole connettersi con te</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactRequestDialog.qml" line="102"/>
@@ -210,37 +210,45 @@
<context>
<name>GeneralPreferences</name>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="12"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="13"/>
<source>Use a single window for conversations</source>
<translation>Usa una finestra singola per le conversazioni</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="20"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="21"/>
<source>Open links in default browser without prompting</source>
- <translation>Apri link nel browser di default senza chiedere</translation>
+ <translation>Apri i link nel browser di default senza chiedere</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="28"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="29"/>
<source>Play audio notifications</source>
- <translation type="unfinished"></translation>
+ <translation>Riproduci suono notifiche</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="37"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="38"/>
<source>Volume</source>
<translation>Volume</translation>
</message>
+ <message>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="53"/>
+ <source>Language</source>
+ <translation type="unfinished">Lingua</translation>
+ </message>
+ <message>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="76"/>
+ <source>Restart Ricochet to apply changes</source>
+ <translation type="unfinished">Riavvia Ricochet per applicare le modifiche</translation>
+ </message>
</context>
<context>
<name>LanguagePreferences</name>
<message>
- <location filename="../src/ui/qml/LanguagePreferences.qml" line="22"/>
<source>Select Language</source>
- <translation>Selezione lingua</translation>
+ <translation type="vanished">Seleziona lingua</translation>
</message>
<message>
- <location filename="../src/ui/qml/LanguagePreferences.qml" line="52"/>
<source>Restart Ricochet to apply changes</source>
- <translation>Riavvia Ricochet per applicare le modifiche</translation>
+ <translation type="vanished">Riavvia Ricochet per applicare le modifiche</translation>
</message>
</context>
<context>
@@ -248,13 +256,13 @@
<message>
<location filename="../src/ui/LanguagesModel.cpp" line="43"/>
<source>System default</source>
- <translation type="unfinished"></translation>
+ <translation>Impostazioni di fabbrica</translation>
</message>
</context>
<context>
<name>Main</name>
<message>
- <location filename="../src/main.cpp" line="73"/>
+ <location filename="../src/main.cpp" line="81"/>
<source>Ricochet Error</source>
<translation>Errore Ricochet</translation>
</message>
@@ -264,7 +272,7 @@
<message>
<location filename="../src/ui/qml/MainToolBar.qml" line="19"/>
<source>Add Contact</source>
- <translation>Aggiungere Contatto</translation>
+ <translation>Aggiungi contatto</translation>
</message>
<message>
<location filename="../src/ui/qml/MainToolBar.qml" line="28"/>
@@ -282,12 +290,12 @@
<message>
<location filename="../src/ui/MainWindow.cpp" line="191"/>
<source>Remove %1</source>
- <translation>Rimuovere %1</translation>
+ <translation>Rimuovi %1</translation>
</message>
<message>
<location filename="../src/ui/MainWindow.cpp" line="192"/>
<source>Do you want to permanently remove %1?</source>
- <translation>Vuoi rimuovere perennemente %1?</translation>
+ <translation>Vuoi rimuovere definitivamente %1?</translation>
</message>
</context>
<context>
@@ -296,7 +304,7 @@
<location filename="../src/ui/qml/MessageDelegate.qml" line="26"/>
<source>%1 is offline</source>
<extracomment>%1 nickname</extracomment>
- <translation>%1 è sconnesso</translation>
+ <translation>%1 non è in linea</translation>
</message>
<message>
<location filename="../src/ui/qml/MessageDelegate.qml" line="135"/>
@@ -306,17 +314,17 @@
<message>
<location filename="../src/ui/qml/MessageDelegate.qml" line="135"/>
<source>Copy Link</source>
- <translation>Copia Link</translation>
+ <translation>Copia link</translation>
</message>
<message>
<location filename="../src/ui/qml/MessageDelegate.qml" line="140"/>
<source>Open with Browser</source>
- <translation>Apri con il Browser</translation>
+ <translation>Apri nel il browser</translation>
</message>
<message>
<location filename="../src/ui/qml/MessageDelegate.qml" line="154"/>
<source>Add as Contact</source>
- <translation>Aggiungi come Contatto</translation>
+ <translation>Aggiungi ai tuoi contatti</translation>
</message>
<message>
<location filename="../src/ui/qml/MessageDelegate.qml" line="166"/>
@@ -334,18 +342,18 @@
<message>
<location filename="../src/ui/qml/MessageDialogWrapper.qml" line="8"/>
<source>Remove %1</source>
- <translation>Rimuovere %1</translation>
+ <translation>Rimuovi %1</translation>
</message>
<message>
<location filename="../src/ui/qml/MessageDialogWrapper.qml" line="10"/>
<source>Do you want to permanently remove %1?</source>
<extracomment>%1 nickname</extracomment>
- <translation>Vuoi rimuovere perennemente %1?</translation>
+ <translation>Vuoi rimuovere %1 definitivamente?</translation>
</message>
<message>
<location filename="../src/ui/qml/MessageDialogWrapper.qml" line="11"/>
<source>This contact will no longer be able to message you, and will be notified about the removal. They may choose to send a new connection request.</source>
- <translation>Questo contatto non sarà più in grado di inviarti messaggi e sarà notificato di questo. Potrebbe decidere di mandare una nuova richiesta.</translation>
+ <translation>Questo contatto non potrà più inviarti messaggi. Riceverà un avviso per informarlo di questo. Potrebbe comunque inviarti una nuova richiesta di inserimento fra i contatti.</translation>
</message>
</context>
<context>
@@ -353,22 +361,22 @@
<message>
<location filename="../src/ui/qml/NetworkSetupWizard.qml" line="100"/>
<source>This computer's Internet connection is free of obstacles. I would like to connect directly to the Tor network.</source>
- <translation>La connessione a internet di questo computer è libera da ostacoli. Vorrei connettermi direttamente alla rete Tor.</translation>
+ <translation>La connessione a Internet di questo computer è libera da ostacoli. Voglio connettermi direttamente alla rete Tor.</translation>
</message>
<message>
<location filename="../src/ui/qml/NetworkSetupWizard.qml" line="107"/>
<source>Connect</source>
- <translation>Collegare</translation>
+ <translation>Connetti</translation>
</message>
<message>
<location filename="../src/ui/qml/NetworkSetupWizard.qml" line="124"/>
<source>This computer's Internet connection is censored, filtered, or proxied. I need to configure network settings.</source>
- <translation>La connessione a internet di questo computer è soggetta a censure, filtri o proxy. Devo configurare le impostazioni del network.</translation>
+ <translation>La connessione a Internet di questo computer è soggetta a censure, filtri o proxy. Devo configurare le impostazioni di rete.</translation>
</message>
<message>
<location filename="../src/ui/qml/NetworkSetupWizard.qml" line="131"/>
<source>Configure</source>
- <translation>Configurare</translation>
+ <translation>Configura</translation>
</message>
</context>
<context>
@@ -376,7 +384,7 @@
<message>
<location filename="../src/ui/qml/OfflineStateItem.qml" line="107"/>
<source>Configure</source>
- <translation>Configurare</translation>
+ <translation>Configura</translation>
</message>
<message>
<location filename="../src/ui/qml/OfflineStateItem.qml" line="115"/>
@@ -392,7 +400,7 @@
<location filename="../src/ui/qml/OfflineStateItem.qml" line="169"/>
<source>Connecting…</source>
<extracomment>\u2026 is ellipsis</extracomment>
- <translation>Collegamento...</translation>
+ <translation>Connessione in corso...</translation>
</message>
</context>
<context>
@@ -400,22 +408,22 @@
<message>
<location filename="../src/ui/qml/OpenBrowserDialog.qml" line="40"/>
<source><b>Warning!</b> Opening links with your default browser will harm your security and anonymity.<br><br>You can <a href='.'>copy to the clipboard</a> instead.</source>
- <translation><b>Attenzione!</b> Aprire link con il tuo browser di default danneggerà la tua sicurezza e anonimia.<br><br>Puoi <a href='.'>copiare negli appunti</a> invece.</translation>
+ <translation><b>Attenzione!</b> Aprire un link nel browser di default metterà a repentaglio la tua sicurezza e anonimia.<br><br>Puoi invece <a href='.'>copiarlo negli appunti</a>.</translation>
</message>
<message>
<location filename="../src/ui/qml/OpenBrowserDialog.qml" line="59"/>
<source>Don't ask again for links from %1</source>
- <translation>Non chiedere ancora per link da %1</translation>
+ <translation>Non chiedere più per i link inviati da %1</translation>
</message>
<message>
<location filename="../src/ui/qml/OpenBrowserDialog.qml" line="65"/>
<source>Don't ask again for any links (not recommended!)</source>
- <translation>Non chiedere più per ogni link (non raccomandato)</translation>
+ <translation>Non chiedere più per ogni link (scelta non consigliata)</translation>
</message>
<message>
<location filename="../src/ui/qml/OpenBrowserDialog.qml" line="72"/>
<source>Open Browser</source>
- <translation>Apri Browser</translation>
+ <translation>Apri browser</translation>
</message>
<message>
<location filename="../src/ui/qml/OpenBrowserDialog.qml" line="84"/>
@@ -433,27 +441,26 @@
<message>
<location filename="../src/ui/qml/PreferencesDialog.qml" line="41"/>
<source>General</source>
- <translation>Generali</translation>
+ <translation>Generale</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="46"/>
<source>Language</source>
- <translation>Lingua</translation>
+ <translation type="vanished">Lingua</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="51"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="46"/>
<source>Contacts</source>
<translation>Contatti</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="56"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="51"/>
<source>Tor</source>
<translation>Tor</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="61"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="56"/>
<source>About</source>
- <translation>Riguardo a </translation>
+ <translation>Info</translation>
</message>
</context>
<context>
@@ -469,7 +476,7 @@
<message>
<location filename="../src/ui/qml/StartupStatusPage.qml" line="18"/>
<source>The Tor process was not started successfully. This is most likely an installation or system error.</source>
- <translation>Tor non è stato avviato correttamente. Probabilmente si tratta di un errore di sistema o di installazione.</translation>
+ <translation>Tor non si è avviato correttamente. Potrebbe trattarsi di un errore di sistema o di installazione.</translation>
</message>
<message>
<location filename="../src/ui/qml/StartupStatusPage.qml" line="49"/>
@@ -483,7 +490,7 @@
<location filename="../src/ui/qml/TorBootstrapStatus.qml" line="17"/>
<source>Connecting to the Tor network…</source>
<extracomment>\u2026 is ellipsis</extracomment>
- <translation>Collegamento al network Tor...</translation>
+ <translation>Collegamento alla rete Tor...</translation>
</message>
<message>
<location filename="../src/ui/qml/TorBootstrapStatus.qml" line="51"/>
@@ -509,86 +516,86 @@
<context>
<name>TorConfigurationPage</name>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="72"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="73"/>
<source>Does this computer need a proxy to access the internet?</source>
<translation>Questo computer necessita di un proxy per accedere a internet?</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="84"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="85"/>
<source>Proxy type:</source>
<translation>Tipo di proxy:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="89"/>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="91"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="90"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="92"/>
<source>None</source>
<translation>Nessuno</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="106"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="107"/>
<source>Address:</source>
<translation>Indirizzo:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="115"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="116"/>
<source>IP address or hostname</source>
<translation>Indirizzo IP o nome host</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="118"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="119"/>
<source>Port:</source>
<translation>Porta:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="129"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="130"/>
<source>Username:</source>
<translation>Nome utente:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="139"/>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="149"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="140"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="150"/>
<source>Optional</source>
- <translation>Opzionale</translation>
+ <translation>Facoltativo</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="142"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="143"/>
<source>Password:</source>
<translation>Password:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="159"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="160"/>
<source>Does this computer's Internet connection go through a firewall that only allows connections to certain ports?</source>
- <translation>La connessione di questo computer passa attraverso un firewall che permette la connessione solo ad alcune porte?</translation>
+ <translation>La connessione ad Internet di questo computer passa attraverso un firewall che consente la connessione solo su determinate porte?</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="170"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="171"/>
<source>Allowed ports:</source>
- <translation>Porte permesse:</translation>
+ <translation>Porte consentite:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="177"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="178"/>
<source>Example: 80,443</source>
<translation>Esempio: 80,443</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="188"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="189"/>
<source>If this computer's Internet connection is censored, you will need to obtain and use bridge relays.</source>
- <translation>Se la connessione a internet di questo computer è censurata dovrai ottenere ed usare dei bridge relay</translation>
+ <translation>Se la connessione a Internet di questo computer è censurata dovrai ottenere ed usare dei bridge relay</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="197"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="198"/>
<source>Enter one or more bridge relays (one per line):</source>
- <translation>Inserisci uno o più bridge relay (uno per linea):</translation>
+ <translation>Aggiungi uno o più bridge relay (uno per linea):</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="212"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="213"/>
<source>Back</source>
<translation>Indietro</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="219"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="220"/>
<source>Connect</source>
- <translation>Collegare</translation>
+ <translation>Connetti</translation>
</message>
</context>
<context>
@@ -620,7 +627,7 @@
<message>
<location filename="../src/ui/qml/TorPreferences.qml" line="27"/>
<source>Control connected:</source>
- <translation>Controllo connesso:</translation>
+ <translation>Control connesso:</translation>
</message>
<message>
<location filename="../src/ui/qml/TorPreferences.qml" line="29"/>
@@ -656,7 +663,7 @@
<message>
<location filename="../src/ui/qml/TorPreferences.qml" line="76"/>
<source>Configure</source>
- <translation>Configurare</translation>
+ <translation>Configura</translation>
</message>
</context>
<context>
@@ -672,13 +679,13 @@
<location filename="../src/ui/qml/TorStateWidget.qml" line="22"/>
<source>Connecting…</source>
<extracomment>\u2026 is ellipsis</extracomment>
- <translation>Collegamento...</translation>
+ <translation>Connessione in corso...</translation>
</message>
<message>
<location filename="../src/ui/qml/TorStateWidget.qml" line="25"/>
<source>Connecting… (%1%)</source>
<extracomment>%1 is progress percentage, e.g. 100</extracomment>
- <translation>Collegamento... (%1%)</translation>
+ <translation>Connessione in corso... (%1%)</translation>
</message>
<message>
<location filename="../src/ui/qml/TorStateWidget.qml" line="32"/>
diff --git a/translation/ricochet_da.ts b/translation/ricochet_nb.ts
similarity index 74%
copy from translation/ricochet_da.ts
copy to translation/ricochet_nb.ts
index 03a1fed..eb29949 100644
--- a/translation/ricochet_da.ts
+++ b/translation/ricochet_nb.ts
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
-<TS version="2.1" language="da">
+<TS version="2.1" language="nb">
<context>
<name>AboutPreferences</name>
<message>
@@ -15,17 +15,17 @@
<message>
<location filename="../src/ui/qml/AddContactDialog.qml" line="51"/>
<source>Share your Ricochet ID to allow connection requests</source>
- <translation>Del dit Ricochet ID for at tillade kontaktanmodninger</translation>
+ <translation>Del din Ricochet-ID for å tillate tilkoblingsforespørsler</translation>
</message>
<message>
<location filename="../src/ui/qml/AddContactDialog.qml" line="107"/>
<source>Cancel</source>
- <translation>Annuller</translation>
+ <translation>Avbryt</translation>
</message>
<message>
<location filename="../src/ui/qml/AddContactDialog.qml" line="112"/>
<source>Add</source>
- <translation>Tilføj</translation>
+ <translation>Legg til</translation>
</message>
</context>
<context>
@@ -33,7 +33,7 @@
<message>
<location filename="../src/ui/qml/ContactActions.qml" line="40"/>
<source>Open Window</source>
- <translation>Åbn Vindue</translation>
+ <translation>Åpne vindu</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactActions.qml" line="44"/>
@@ -43,7 +43,7 @@
<message>
<location filename="../src/ui/qml/ContactActions.qml" line="48"/>
<source>Rename</source>
- <translation>Omdøb</translation>
+ <translation>Endre navn</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactActions.qml" line="53"/>
@@ -54,29 +54,29 @@
<context>
<name>ContactIDField</name>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="40"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="41"/>
<source><b>%1</b> is already your contact</source>
- <translation><b>%1</b> er allerede på din kontaktliste</translation>
+ <translation><b>%1</b> er allerede din kontakt</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="42"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="43"/>
<source>You can't add yourself as a contact</source>
- <translation>Du kan ikke tilføje dig selv som kontaktperson</translation>
+ <translation>Du kan ikke legge til deg selv som en kontakt</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="44"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="45"/>
<source>Enter an ID starting with <b>ricochet:</b></source>
- <translation>Skriv et ID der begynder med <b>ricochet:</b></translation>
+ <translation>Skriv inn en ID som starter med <b>ricochet:</b></translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="80"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="81"/>
<source>Copied to clipboard</source>
- <translation>Kopieret til clipboardet</translation>
+ <translation>Kopiert til utklippstavlen</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="92"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="93"/>
<source>Copy</source>
- <translation>Kopiér</translation>
+ <translation>Kopier</translation>
</message>
</context>
<context>
@@ -84,27 +84,27 @@
<message>
<location filename="../src/ui/qml/ContactList.qml" line="76"/>
<source>Online</source>
- <translation>Online</translation>
+ <translation>Tilkoblet</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactList.qml" line="77"/>
<source>Offline</source>
- <translation>Offline</translation>
+ <translation>Frakoblet</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactList.qml" line="78"/>
<source>Requests</source>
- <translation>Anmodninger</translation>
+ <translation>Forespørsler</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactList.qml" line="79"/>
<source>Rejected</source>
- <translation>Afvist</translation>
+ <translation>Avvist</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactList.qml" line="80"/>
<source>Outdated</source>
- <translation>Forældet</translation>
+ <translation>Utdatert</translation>
</message>
</context>
<context>
@@ -112,58 +112,58 @@
<message>
<location filename="../src/ui/qml/ContactPreferences.qml" line="98"/>
<source>Date added:</source>
- <translation>Dato tilføjet:</translation>
+ <translation>Dato lagt til:</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactPreferences.qml" line="106"/>
<source>Last seen:</source>
- <translation>Sidst set:</translation>
+ <translation>Sist sett:</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactPreferences.qml" line="116"/>
<source>Request:</source>
- <translation>Anmodning:</translation>
+ <translation>Forespørsel:</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactPreferences.qml" line="126"/>
<source>Pending connection</source>
- <translation>Afventer forbindelse</translation>
+ <translation>I påvente av forbindelse</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactPreferences.qml" line="127"/>
<source>Delivered</source>
- <translation>Afleveret</translation>
+ <translation>Levert</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactPreferences.qml" line="128"/>
<source>Accepted</source>
- <translation>Accepteret</translation>
+ <translation>Godtatt</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactPreferences.qml" line="129"/>
<source>Error</source>
- <translation>Fejl</translation>
+ <translation>Feil</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactPreferences.qml" line="130"/>
<source>Rejected</source>
- <translation>Afvist</translation>
+ <translation>Avvist</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactPreferences.qml" line="134"/>
<source>%1 (Connected)</source>
<extracomment>%1 status, e.g. "Accepted"</extracomment>
- <translation>%1 (Forbundet)</translation>
+ <translation>%1 (tilkoblet)</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactPreferences.qml" line="140"/>
<source>Response:</source>
- <translation>Svar:</translation>
+ <translation>Respons:</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactPreferences.qml" line="163"/>
<source>Rename</source>
- <translation>Omdøb</translation>
+ <translation>Endre navn</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactPreferences.qml" line="170"/>
@@ -176,17 +176,17 @@
<message>
<location filename="../src/ui/qml/ContactRequestDialog.qml" line="55"/>
<source>Someone new is asking to connect to you</source>
- <translation>Du har en ny kontaktanmodning</translation>
+ <translation>Noen nye spør om de kan å få koble til</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactRequestDialog.qml" line="102"/>
<source>Reject</source>
- <translation>Afvis</translation>
+ <translation>Avvist</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactRequestDialog.qml" line="107"/>
<source>Accept</source>
- <translation>Acceptér</translation>
+ <translation>Godta</translation>
</message>
</context>
<context>
@@ -204,43 +204,51 @@
<message>
<location filename="../src/ui/qml/ContactRequestFields.qml" line="40"/>
<source>Message:</source>
- <translation>Besked:</translation>
+ <translation>Melding:</translation>
</message>
</context>
<context>
<name>GeneralPreferences</name>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="12"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="13"/>
<source>Use a single window for conversations</source>
- <translation>Hold samtaler i ét vindue</translation>
+ <translation>Bruk ètt vindu for samtaler</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="20"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="21"/>
<source>Open links in default browser without prompting</source>
- <translation>Åbn links i browser uden at spørge</translation>
+ <translation>Åpne lenker i standardnettleser uten å spørre</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="28"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="29"/>
<source>Play audio notifications</source>
- <translation>Afspil lydnotifikationer</translation>
+ <translation>Spill av lydvarsler</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="37"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="38"/>
<source>Volume</source>
- <translation>Lydstyrke</translation>
+ <translation>Volum</translation>
+ </message>
+ <message>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="53"/>
+ <source>Language</source>
+ <translation type="unfinished">Språk</translation>
+ </message>
+ <message>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="76"/>
+ <source>Restart Ricochet to apply changes</source>
+ <translation type="unfinished">Ta en omstart av Ricochet for å bruke endringene</translation>
</message>
</context>
<context>
<name>LanguagePreferences</name>
<message>
- <location filename="../src/ui/qml/LanguagePreferences.qml" line="22"/>
<source>Select Language</source>
- <translation>Vælg sprog</translation>
+ <translation type="vanished">Velg språk</translation>
</message>
<message>
- <location filename="../src/ui/qml/LanguagePreferences.qml" line="52"/>
<source>Restart Ricochet to apply changes</source>
- <translation>Genstart Ricochet for at anvende nye indstillinger</translation>
+ <translation type="vanished">Ta en omstart av Ricochet for å bruke endringene</translation>
</message>
</context>
<context>
@@ -248,15 +256,15 @@
<message>
<location filename="../src/ui/LanguagesModel.cpp" line="43"/>
<source>System default</source>
- <translation>Standardindstillinger</translation>
+ <translation>Systemstandard</translation>
</message>
</context>
<context>
<name>Main</name>
<message>
- <location filename="../src/main.cpp" line="73"/>
+ <location filename="../src/main.cpp" line="81"/>
<source>Ricochet Error</source>
- <translation>Ricochet Fejl</translation>
+ <translation>Ricochet-feil</translation>
</message>
</context>
<context>
@@ -264,17 +272,17 @@
<message>
<location filename="../src/ui/qml/MainToolBar.qml" line="19"/>
<source>Add Contact</source>
- <translation>Tilføj Kontaktperson</translation>
+ <translation>Legg til kontakt</translation>
</message>
<message>
<location filename="../src/ui/qml/MainToolBar.qml" line="28"/>
<source>Preferences</source>
- <translation>Indstillinger</translation>
+ <translation>Preferanser</translation>
</message>
<message>
<location filename="../src/ui/qml/MainToolBar.qml" line="75"/>
<source>Click to add contacts</source>
- <translation>Klik for at tilføje kontaktpersoner</translation>
+ <translation>Trykk for å legge til kontakter</translation>
</message>
</context>
<context>
@@ -287,7 +295,7 @@
<message>
<location filename="../src/ui/MainWindow.cpp" line="192"/>
<source>Do you want to permanently remove %1?</source>
- <translation>Vil du fjerne %1 permanent?</translation>
+ <translation>Ønsker du å slette %1 for alltid?</translation>
</message>
</context>
<context>
@@ -296,37 +304,37 @@
<location filename="../src/ui/qml/MessageDelegate.qml" line="26"/>
<source>%1 is offline</source>
<extracomment>%1 nickname</extracomment>
- <translation>%1 er offline</translation>
+ <translation>%1 er frakoblet</translation>
</message>
<message>
<location filename="../src/ui/qml/MessageDelegate.qml" line="135"/>
<source>Copy ID</source>
- <translation>Kopiér ID</translation>
+ <translation>Kopier ID</translation>
</message>
<message>
<location filename="../src/ui/qml/MessageDelegate.qml" line="135"/>
<source>Copy Link</source>
- <translation>Kopiér Link</translation>
+ <translation>Kopier lenke</translation>
</message>
<message>
<location filename="../src/ui/qml/MessageDelegate.qml" line="140"/>
<source>Open with Browser</source>
- <translation>Åbn i browser</translation>
+ <translation>Åpne i nettleser</translation>
</message>
<message>
<location filename="../src/ui/qml/MessageDelegate.qml" line="154"/>
<source>Add as Contact</source>
- <translation>Tilføj som kontaktperson</translation>
+ <translation>Legg til som kontakt</translation>
</message>
<message>
<location filename="../src/ui/qml/MessageDelegate.qml" line="166"/>
<source>Copy Message</source>
- <translation>Kopiér besked</translation>
+ <translation>Kopier melding</translation>
</message>
<message>
<location filename="../src/ui/qml/MessageDelegate.qml" line="173"/>
<source>Copy Selection</source>
- <translation>Kopiér markeret tekst</translation>
+ <translation>Kopier utvalg</translation>
</message>
</context>
<context>
@@ -340,12 +348,12 @@
<location filename="../src/ui/qml/MessageDialogWrapper.qml" line="10"/>
<source>Do you want to permanently remove %1?</source>
<extracomment>%1 nickname</extracomment>
- <translation>Vil du fjerne %1 permanent?</translation>
+ <translation>Ønsker du å permanent fjerne %1?</translation>
</message>
<message>
<location filename="../src/ui/qml/MessageDialogWrapper.qml" line="11"/>
<source>This contact will no longer be able to message you, and will be notified about the removal. They may choose to send a new connection request.</source>
- <translation>Denne kontaktperson vil ikke længere være i stand til at sende dig beskeder, og vil blive notificeret om fjernelsen. Kontaktpersonen kan vælge at sende dig en ny kontaktanmodning.</translation>
+ <translation>Denne kontakten vil ikke lengre være i stand til å kunne kontakte deg og er blitt varslet om dette. Vedkommende kan velge å sende ny tilkoblingsforespørsel.</translation>
</message>
</context>
<context>
@@ -353,22 +361,22 @@
<message>
<location filename="../src/ui/qml/NetworkSetupWizard.qml" line="100"/>
<source>This computer's Internet connection is free of obstacles. I would like to connect directly to the Tor network.</source>
- <translation>Denne computers internetadgang er uhindret. Jeg vil gerne forbinde direkte til Tor-netværket.</translation>
+ <translation>Denne datamaskinens internettforbindelse er fri for hindre. Jeg ønsker å koble direkte til Tor-nettverket.</translation>
</message>
<message>
<location filename="../src/ui/qml/NetworkSetupWizard.qml" line="107"/>
<source>Connect</source>
- <translation>Forbind</translation>
+ <translation>Koble til</translation>
</message>
<message>
<location filename="../src/ui/qml/NetworkSetupWizard.qml" line="124"/>
<source>This computer's Internet connection is censored, filtered, or proxied. I need to configure network settings.</source>
- <translation>Denne computers internetadgang er censureret, filtreret eller bag en proxy. Jeg har brug for at konfigurere netværksindstillinger.</translation>
+ <translation>Denne datamaskinens internettforbindelse er sensurert, filtrert, eller bak proxy. Jeg trenger å konfigurere nettverksinnstillinger.</translation>
</message>
<message>
<location filename="../src/ui/qml/NetworkSetupWizard.qml" line="131"/>
<source>Configure</source>
- <translation>Konfigurér</translation>
+ <translation>Konfigurer</translation>
</message>
</context>
<context>
@@ -376,7 +384,7 @@
<message>
<location filename="../src/ui/qml/OfflineStateItem.qml" line="107"/>
<source>Configure</source>
- <translation>Konfigurér</translation>
+ <translation>Konfigurer</translation>
</message>
<message>
<location filename="../src/ui/qml/OfflineStateItem.qml" line="115"/>
@@ -386,13 +394,13 @@
<message>
<location filename="../src/ui/qml/OfflineStateItem.qml" line="143"/>
<source>Connection failed</source>
- <translation>Forbindelsen mislykkedes</translation>
+ <translation>Tilkoblingsfeil</translation>
</message>
<message>
<location filename="../src/ui/qml/OfflineStateItem.qml" line="169"/>
<source>Connecting…</source>
<extracomment>\u2026 is ellipsis</extracomment>
- <translation>Forbinder…</translation>
+ <translation>Kobler til...</translation>
</message>
</context>
<context>
@@ -400,27 +408,27 @@
<message>
<location filename="../src/ui/qml/OpenBrowserDialog.qml" line="40"/>
<source><b>Warning!</b> Opening links with your default browser will harm your security and anonymity.<br><br>You can <a href='.'>copy to the clipboard</a> instead.</source>
- <translation><b>Advarsel!</b> Ved at åbne links med din browser kan du forringe din sikkerhed og anonymitet.<br><br>Du kan <a href='.'>kopiere adressen til clipboardet</a> i stedet.</translation>
+ <translation><b>Advarsel!</b> Åpning av lenker i din standardnettleser vil svekke sikkerheten og minske anonymiteten din.<br><br>Du kan <a href='.'>kopiere til utklippstavlen</a> i stedet for.</translation>
</message>
<message>
<location filename="../src/ui/qml/OpenBrowserDialog.qml" line="59"/>
<source>Don't ask again for links from %1</source>
- <translation>Spørg ikke igen om links fra %1</translation>
+ <translation>Ikke spør igjen for lenker fra %1</translation>
</message>
<message>
<location filename="../src/ui/qml/OpenBrowserDialog.qml" line="65"/>
<source>Don't ask again for any links (not recommended!)</source>
- <translation>Spørg ikke om nogen links (ikke anbefalt!)</translation>
+ <translation>Ikke spør igjen for noen lenker som helst (ikke anbefalt!)</translation>
</message>
<message>
<location filename="../src/ui/qml/OpenBrowserDialog.qml" line="72"/>
<source>Open Browser</source>
- <translation>Åbn Browser</translation>
+ <translation>Åpne nettleser</translation>
</message>
<message>
<location filename="../src/ui/qml/OpenBrowserDialog.qml" line="84"/>
<source>Cancel</source>
- <translation>Annullér</translation>
+ <translation>Avbryt</translation>
</message>
</context>
<context>
@@ -428,7 +436,7 @@
<message>
<location filename="../src/ui/qml/PreferencesDialog.qml" line="12"/>
<source>Ricochet Preferences</source>
- <translation>Indstillinger for Ricochet</translation>
+ <translation>Ricochet-preferanser</translation>
</message>
<message>
<location filename="../src/ui/qml/PreferencesDialog.qml" line="41"/>
@@ -436,22 +444,21 @@
<translation>Generelt</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="46"/>
<source>Language</source>
- <translation>Sprog</translation>
+ <translation type="vanished">Språk</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="51"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="46"/>
<source>Contacts</source>
- <translation>Kontaktpersoner</translation>
+ <translation>Kontakter</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="56"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="51"/>
<source>Tor</source>
<translation>Tor</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="61"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="56"/>
<source>About</source>
<translation>Om</translation>
</message>
@@ -461,7 +468,7 @@
<message>
<location filename="../src/ui/qml/MainWindow.qml" line="29"/>
<source>Preference</source>
- <translation>Indstilling</translation>
+ <translation>Preferanse</translation>
</message>
</context>
<context>
@@ -469,12 +476,12 @@
<message>
<location filename="../src/ui/qml/StartupStatusPage.qml" line="18"/>
<source>The Tor process was not started successfully. This is most likely an installation or system error.</source>
- <translation>Tor-processen kunne ikke starte. Dette er sandsynligvis en installations- eller systemfejl.</translation>
+ <translation>Tor-prosessen ble ikke startet vellykket. Dette er mest sannsynlig en installasjons- eller systemfeil.</translation>
</message>
<message>
<location filename="../src/ui/qml/StartupStatusPage.qml" line="49"/>
<source>Quit</source>
- <translation>Afslut</translation>
+ <translation>Avslutt</translation>
</message>
</context>
<context>
@@ -483,17 +490,17 @@
<location filename="../src/ui/qml/TorBootstrapStatus.qml" line="17"/>
<source>Connecting to the Tor network…</source>
<extracomment>\u2026 is ellipsis</extracomment>
- <translation>Forbinder til Tor-netværket…</translation>
+ <translation>Kobler til Tor-nettverket</translation>
</message>
<message>
<location filename="../src/ui/qml/TorBootstrapStatus.qml" line="51"/>
<source>Back</source>
- <translation>Tilbage</translation>
+ <translation>Tilbake</translation>
</message>
<message>
<location filename="../src/ui/qml/TorBootstrapStatus.qml" line="58"/>
<source>Hide details</source>
- <translation>Skjul detaljer</translation>
+ <translation>Gjem detaljer</translation>
</message>
<message>
<location filename="../src/ui/qml/TorBootstrapStatus.qml" line="58"/>
@@ -503,92 +510,92 @@
<message>
<location filename="../src/ui/qml/TorBootstrapStatus.qml" line="70"/>
<source>Done</source>
- <translation>Færdig</translation>
+ <translation>Ferdig</translation>
</message>
</context>
<context>
<name>TorConfigurationPage</name>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="72"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="73"/>
<source>Does this computer need a proxy to access the internet?</source>
- <translation>Skal denne computer forbinde gennem en proxy for at tilgå internettet?</translation>
+ <translation>Trenger denne datamaskinen proxy for å få tilgang til Internett?</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="84"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="85"/>
<source>Proxy type:</source>
- <translation>Proxy type:</translation>
+ <translation>Proxytype:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="89"/>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="91"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="90"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="92"/>
<source>None</source>
<translation>Ingen</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="106"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="107"/>
<source>Address:</source>
<translation>Adresse:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="115"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="116"/>
<source>IP address or hostname</source>
- <translation>IP-adresse eller værtsnavn</translation>
+ <translation>IP-adresse eller vertsnavn</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="118"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="119"/>
<source>Port:</source>
<translation>Port:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="129"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="130"/>
<source>Username:</source>
- <translation>Brugernavn:</translation>
+ <translation>Brukernavn:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="139"/>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="149"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="140"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="150"/>
<source>Optional</source>
- <translation>Valgfrit</translation>
+ <translation>Valgfri</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="142"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="143"/>
<source>Password:</source>
- <translation>Adgangskode:</translation>
+ <translation>Passord:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="159"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="160"/>
<source>Does this computer's Internet connection go through a firewall that only allows connections to certain ports?</source>
- <translation>Går denne computers internetforbindelse gennem en firewall der kun tillader forbindelser på visse porte?</translation>
+ <translation>Går denne datamaskinens internettforbindelse gjennom en brannmur som kun tillater forbindelser til bestemte porter?</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="170"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="171"/>
<source>Allowed ports:</source>
- <translation>Tilladte porte:</translation>
+ <translation>Tillatte porter:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="177"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="178"/>
<source>Example: 80,443</source>
<translation>Eksempel: 80,443</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="188"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="189"/>
<source>If this computer's Internet connection is censored, you will need to obtain and use bridge relays.</source>
- <translation>Hvis denne computers internetforbindelse er censureret, er du nødt til at finde og benytte bridge relæer.</translation>
+ <translation>Hvis denne datamaskinens internettforbindelse er sensurert må du få tak i og bruke broreléer.</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="197"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="198"/>
<source>Enter one or more bridge relays (one per line):</source>
- <translation>Indsæt én eller flere bridgerelæer (én per linje):</translation>
+ <translation>Skriv inn et eller flere broreléer (et relé per linje):</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="212"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="213"/>
<source>Back</source>
- <translation>Tilbage</translation>
+ <translation>Tilbake</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="219"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="220"/>
<source>Connect</source>
- <translation>Forbind</translation>
+ <translation>Koble til</translation>
</message>
</context>
<context>
@@ -596,7 +603,7 @@
<message>
<location filename="../src/ui/qml/TorPreferences.qml" line="25"/>
<source>Running:</source>
- <translation>Kører:</translation>
+ <translation>Kjører:</translation>
</message>
<message>
<location filename="../src/ui/qml/TorPreferences.qml" line="26"/>
@@ -610,7 +617,7 @@
<location filename="../src/ui/qml/TorPreferences.qml" line="28"/>
<location filename="../src/ui/qml/TorPreferences.qml" line="30"/>
<source>No</source>
- <translation>Nej</translation>
+ <translation>Nei</translation>
</message>
<message>
<location filename="../src/ui/qml/TorPreferences.qml" line="26"/>
@@ -620,43 +627,43 @@
<message>
<location filename="../src/ui/qml/TorPreferences.qml" line="27"/>
<source>Control connected:</source>
- <translation>Kontrol forbundet:</translation>
+ <translation>Kontroll tilkoblet:</translation>
</message>
<message>
<location filename="../src/ui/qml/TorPreferences.qml" line="29"/>
<source>Circuits established:</source>
- <translation>Kredsløb etableret:</translation>
+ <translation>Etablerte kretser:</translation>
</message>
<message>
<location filename="../src/ui/qml/TorPreferences.qml" line="31"/>
<source>Hidden service:</source>
- <translation>Skjult service:</translation>
+ <translation>Skjult tjeneste:</translation>
</message>
<message>
<location filename="../src/ui/qml/TorPreferences.qml" line="32"/>
<source>Online</source>
- <translation>Online</translation>
+ <translation>Pålogget</translation>
</message>
<message>
<location filename="../src/ui/qml/TorPreferences.qml" line="32"/>
<source>Offline</source>
- <translation>Offline</translation>
+ <translation>Frakoblet</translation>
</message>
<message>
<location filename="../src/ui/qml/TorPreferences.qml" line="33"/>
<source>Version:</source>
- <translation>Version:</translation>
+ <translation>Versjon:</translation>
</message>
<message>
<location filename="../src/ui/qml/TorPreferences.qml" line="60"/>
<source>Error: <b>%1</b></source>
<extracomment>%1 is error message</extracomment>
- <translation>Fejl: <b>%1</b></translation>
+ <translation>Feil: <b>%1</b></translation>
</message>
<message>
<location filename="../src/ui/qml/TorPreferences.qml" line="76"/>
<source>Configure</source>
- <translation>Konfigurér</translation>
+ <translation>Konfigurer</translation>
</message>
</context>
<context>
@@ -665,30 +672,30 @@
<location filename="../src/ui/qml/TorStateWidget.qml" line="9"/>
<location filename="../src/ui/qml/TorStateWidget.qml" line="20"/>
<source>Connection failed</source>
- <translation>Forbindelse mislykkedes</translation>
+ <translation>Tilkoblingsfeil</translation>
</message>
<message>
<location filename="../src/ui/qml/TorStateWidget.qml" line="12"/>
<location filename="../src/ui/qml/TorStateWidget.qml" line="22"/>
<source>Connecting…</source>
<extracomment>\u2026 is ellipsis</extracomment>
- <translation>Forbinder…</translation>
+ <translation>Kobler til...</translation>
</message>
<message>
<location filename="../src/ui/qml/TorStateWidget.qml" line="25"/>
<source>Connecting… (%1%)</source>
<extracomment>%1 is progress percentage, e.g. 100</extracomment>
- <translation>Forbinder… (%1)</translation>
+ <translation>Kobler til... (%1%)</translation>
</message>
<message>
<location filename="../src/ui/qml/TorStateWidget.qml" line="32"/>
<source>Online</source>
- <translation>Online</translation>
+ <translation>Pålogget</translation>
</message>
<message>
<location filename="../src/ui/qml/TorStateWidget.qml" line="34"/>
<source>Connected</source>
- <translation>Forbundet</translation>
+ <translation>Tilkoblet</translation>
</message>
</context>
</TS>
diff --git a/translation/ricochet_nl_NL.ts b/translation/ricochet_nl_NL.ts
index 3c6d0c3..9ea7ec0 100644
--- a/translation/ricochet_nl_NL.ts
+++ b/translation/ricochet_nl_NL.ts
@@ -54,27 +54,27 @@
<context>
<name>ContactIDField</name>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="40"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="41"/>
<source><b>%1</b> is already your contact</source>
<translation><b>%1</b> is al een contact</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="42"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="43"/>
<source>You can't add yourself as a contact</source>
<translation>Je kunt jezelf niet als contact toevoegen</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="44"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="45"/>
<source>Enter an ID starting with <b>ricochet:</b></source>
<translation>Geef een ID op dat begint met <b>ricochet:</b></translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="80"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="81"/>
<source>Copied to clipboard</source>
<translation>Gekopieerd naar klembord</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="92"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="93"/>
<source>Copy</source>
<translation>Kopieer</translation>
</message>
@@ -210,37 +210,45 @@
<context>
<name>GeneralPreferences</name>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="12"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="13"/>
<source>Use a single window for conversations</source>
<translation>Gebruik een enkel venster voor gesprekken</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="20"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="21"/>
<source>Open links in default browser without prompting</source>
<translation>Open links in standaardbrowser zonder te vragen </translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="28"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="29"/>
<source>Play audio notifications</source>
<translation>Afspelen audio meldingen</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="37"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="38"/>
<source>Volume</source>
<translation>Volume</translation>
</message>
+ <message>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="53"/>
+ <source>Language</source>
+ <translation type="unfinished">Taal</translation>
+ </message>
+ <message>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="76"/>
+ <source>Restart Ricochet to apply changes</source>
+ <translation type="unfinished">Herstart Ricochet om wijzigingen door te voeren</translation>
+ </message>
</context>
<context>
<name>LanguagePreferences</name>
<message>
- <location filename="../src/ui/qml/LanguagePreferences.qml" line="22"/>
<source>Select Language</source>
- <translation>Kies taal</translation>
+ <translation type="vanished">Kies taal</translation>
</message>
<message>
- <location filename="../src/ui/qml/LanguagePreferences.qml" line="52"/>
<source>Restart Ricochet to apply changes</source>
- <translation>Herstart Ricochet om wijzigingen door te voeren</translation>
+ <translation type="vanished">Herstart Ricochet om wijzigingen door te voeren</translation>
</message>
</context>
<context>
@@ -254,7 +262,7 @@
<context>
<name>Main</name>
<message>
- <location filename="../src/main.cpp" line="73"/>
+ <location filename="../src/main.cpp" line="81"/>
<source>Ricochet Error</source>
<translation>Ricochet fout</translation>
</message>
@@ -436,22 +444,21 @@
<translation>Algemeen</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="46"/>
<source>Language</source>
- <translation>Taal</translation>
+ <translation type="vanished">Taal</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="51"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="46"/>
<source>Contacts</source>
<translation>Contacten</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="56"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="51"/>
<source>Tor</source>
<translation>Tor</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="61"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="56"/>
<source>About</source>
<translation>Over</translation>
</message>
@@ -509,84 +516,84 @@
<context>
<name>TorConfigurationPage</name>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="72"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="73"/>
<source>Does this computer need a proxy to access the internet?</source>
<translation>Heeft deze computer een proxy nodig om te verbinden met het internet?</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="84"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="85"/>
<source>Proxy type:</source>
<translation>Proxy type:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="89"/>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="91"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="90"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="92"/>
<source>None</source>
<translation>Geen</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="106"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="107"/>
<source>Address:</source>
<translation>Adres:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="115"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="116"/>
<source>IP address or hostname</source>
<translation>IP adres of servernaam</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="118"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="119"/>
<source>Port:</source>
<translation>Poort:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="129"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="130"/>
<source>Username:</source>
<translation>Gebruikersnaam:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="139"/>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="149"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="140"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="150"/>
<source>Optional</source>
<translation>Optioneel</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="142"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="143"/>
<source>Password:</source>
<translation>Wachtwoord:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="159"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="160"/>
<source>Does this computer's Internet connection go through a firewall that only allows connections to certain ports?</source>
<translation>Gaat de internetverbinding van deze computer door een firewall die alleen verbindingen naar bepaalde poorten toestaat?</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="170"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="171"/>
<source>Allowed ports:</source>
<translation>Toegestane poorten:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="177"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="178"/>
<source>Example: 80,443</source>
<translation>Voorbeeld: 80,443</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="188"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="189"/>
<source>If this computer's Internet connection is censored, you will need to obtain and use bridge relays.</source>
<translation>Als de internetverbinding van deze computer is gecensureerd, moet je bridge relays vinden en gebruiken.</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="197"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="198"/>
<source>Enter one or more bridge relays (one per line):</source>
<translation>Geen een of meer bridge relays op (een per regel):</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="212"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="213"/>
<source>Back</source>
<translation>Terug</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="219"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="220"/>
<source>Connect</source>
<translation>Verbinden</translation>
</message>
diff --git a/translation/ricochet_pl.ts b/translation/ricochet_pl.ts
index 7cc2370..a62ed7a 100644
--- a/translation/ricochet_pl.ts
+++ b/translation/ricochet_pl.ts
@@ -54,27 +54,27 @@
<context>
<name>ContactIDField</name>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="40"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="41"/>
<source><b>%1</b> is already your contact</source>
<translation><b>%1</b> jest już w Twoich kontaktach</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="42"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="43"/>
<source>You can't add yourself as a contact</source>
<translation>Nie możesz dodać siebie do kontaktów</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="44"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="45"/>
<source>Enter an ID starting with <b>ricochet:</b></source>
<translation>Wpisz ID zaczynające się od <b>ricochet:</b></translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="80"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="81"/>
<source>Copied to clipboard</source>
<translation>Skopiowano do schowka</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="92"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="93"/>
<source>Copy</source>
<translation>Kopiuj</translation>
</message>
@@ -210,37 +210,45 @@
<context>
<name>GeneralPreferences</name>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="12"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="13"/>
<source>Use a single window for conversations</source>
<translation>Używaj pojedynczego okno do rozmów</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="20"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="21"/>
<source>Open links in default browser without prompting</source>
<translation>Otwórz linki w domyślnej przeglądarce bez pytania</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="28"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="29"/>
<source>Play audio notifications</source>
<translation>Włącz powiadomienia dźwiękowe</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="37"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="38"/>
<source>Volume</source>
<translation>Głośność</translation>
</message>
+ <message>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="53"/>
+ <source>Language</source>
+ <translation type="unfinished">Język</translation>
+ </message>
+ <message>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="76"/>
+ <source>Restart Ricochet to apply changes</source>
+ <translation type="unfinished">Aby zaakceptować zmiany, uruchom Ricochet ponownie</translation>
+ </message>
</context>
<context>
<name>LanguagePreferences</name>
<message>
- <location filename="../src/ui/qml/LanguagePreferences.qml" line="22"/>
<source>Select Language</source>
- <translation>Wybierz język</translation>
+ <translation type="vanished">Wybierz język</translation>
</message>
<message>
- <location filename="../src/ui/qml/LanguagePreferences.qml" line="52"/>
<source>Restart Ricochet to apply changes</source>
- <translation>Aby zaakceptować zmiany, uruchom Ricochet ponownie</translation>
+ <translation type="vanished">Aby zaakceptować zmiany, uruchom Ricochet ponownie</translation>
</message>
</context>
<context>
@@ -254,7 +262,7 @@
<context>
<name>Main</name>
<message>
- <location filename="../src/main.cpp" line="73"/>
+ <location filename="../src/main.cpp" line="81"/>
<source>Ricochet Error</source>
<translation>Błąd programu Ricochet</translation>
</message>
@@ -436,22 +444,21 @@
<translation>Główne</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="46"/>
<source>Language</source>
- <translation>Język</translation>
+ <translation type="vanished">Język</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="51"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="46"/>
<source>Contacts</source>
<translation>Kontakty</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="56"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="51"/>
<source>Tor</source>
<translation>Tor</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="61"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="56"/>
<source>About</source>
<translation>O programie</translation>
</message>
@@ -509,84 +516,84 @@
<context>
<name>TorConfigurationPage</name>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="72"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="73"/>
<source>Does this computer need a proxy to access the internet?</source>
<translation>Czy ten komputer potrzebuje serwera proxy, aby łączyć się z Internetem?</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="84"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="85"/>
<source>Proxy type:</source>
<translation>Typ proxy:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="89"/>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="91"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="90"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="92"/>
<source>None</source>
<translation>Brak</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="106"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="107"/>
<source>Address:</source>
<translation>Adres:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="115"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="116"/>
<source>IP address or hostname</source>
<translation>Adres IP lub nazwa hosta</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="118"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="119"/>
<source>Port:</source>
<translation>Port:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="129"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="130"/>
<source>Username:</source>
<translation>Nazwa użytkownika:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="139"/>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="149"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="140"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="150"/>
<source>Optional</source>
<translation>Opcjonalny</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="142"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="143"/>
<source>Password:</source>
<translation>Hasło:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="159"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="160"/>
<source>Does this computer's Internet connection go through a firewall that only allows connections to certain ports?</source>
<translation>Czy połączenie internetowe tego komputera jest kierowane przez firewall, który pozwala na łączenie się tylko z wybranymi portami?</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="170"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="171"/>
<source>Allowed ports:</source>
<translation>Dozwolone porty:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="177"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="178"/>
<source>Example: 80,443</source>
<translation>Na przykład: 80,443</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="188"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="189"/>
<source>If this computer's Internet connection is censored, you will need to obtain and use bridge relays.</source>
<translation>Jeżeli połączenie internetowe tego komputera jest cenzurowane, będziesz musiał uzyskać dostęp do węzła pośredniego (<i>bridge relay</i>).</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="197"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="198"/>
<source>Enter one or more bridge relays (one per line):</source>
<translation>Podaj jeden lub więcej węzłów pośrednich (jeden w linii):</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="212"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="213"/>
<source>Back</source>
<translation>Wróć</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="219"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="220"/>
<source>Connect</source>
<translation>Połącz</translation>
</message>
diff --git a/translation/ricochet_pt_BR.ts b/translation/ricochet_pt_BR.ts
index 34134a4..f13ce46 100644
--- a/translation/ricochet_pt_BR.ts
+++ b/translation/ricochet_pt_BR.ts
@@ -54,27 +54,27 @@
<context>
<name>ContactIDField</name>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="40"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="41"/>
<source><b>%1</b> is already your contact</source>
<translation><b>%1</b> já é seu contato</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="42"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="43"/>
<source>You can't add yourself as a contact</source>
<translation>Você não pode adicionar a si mesmo como um contato</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="44"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="45"/>
<source>Enter an ID starting with <b>ricochet:</b></source>
<translation>Entre uma ID começando com <b>ricochet:</b></translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="80"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="81"/>
<source>Copied to clipboard</source>
<translation>Copiado para a área de transferência</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="92"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="93"/>
<source>Copy</source>
<translation>Copiar</translation>
</message>
@@ -210,37 +210,45 @@
<context>
<name>GeneralPreferences</name>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="12"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="13"/>
<source>Use a single window for conversations</source>
<translation>Usar somente uma janela para conversas</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="20"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="21"/>
<source>Open links in default browser without prompting</source>
<translation>Abrir links no navegador padrão sem pedir confirmação</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="28"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="29"/>
<source>Play audio notifications</source>
<translation>Tocar notificações de áudio</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="37"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="38"/>
<source>Volume</source>
<translation>Volume</translation>
</message>
+ <message>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="53"/>
+ <source>Language</source>
+ <translation type="unfinished">Idioma</translation>
+ </message>
+ <message>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="76"/>
+ <source>Restart Ricochet to apply changes</source>
+ <translation type="unfinished">Reiniciar Ricochet para aplicar mudanças</translation>
+ </message>
</context>
<context>
<name>LanguagePreferences</name>
<message>
- <location filename="../src/ui/qml/LanguagePreferences.qml" line="22"/>
<source>Select Language</source>
- <translation>Selecionar Linguagem</translation>
+ <translation type="vanished">Selecionar Linguagem</translation>
</message>
<message>
- <location filename="../src/ui/qml/LanguagePreferences.qml" line="52"/>
<source>Restart Ricochet to apply changes</source>
- <translation>Reiniciar Ricochet para aplicar mudanças</translation>
+ <translation type="vanished">Reiniciar Ricochet para aplicar mudanças</translation>
</message>
</context>
<context>
@@ -254,7 +262,7 @@
<context>
<name>Main</name>
<message>
- <location filename="../src/main.cpp" line="73"/>
+ <location filename="../src/main.cpp" line="81"/>
<source>Ricochet Error</source>
<translation>Erro do Ricochet</translation>
</message>
@@ -436,22 +444,21 @@
<translation>Geral</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="46"/>
<source>Language</source>
- <translation>Idioma</translation>
+ <translation type="vanished">Idioma</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="51"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="46"/>
<source>Contacts</source>
<translation>Contatos</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="56"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="51"/>
<source>Tor</source>
<translation>Tor</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="61"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="56"/>
<source>About</source>
<translation>Sobre</translation>
</message>
@@ -509,84 +516,84 @@
<context>
<name>TorConfigurationPage</name>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="72"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="73"/>
<source>Does this computer need a proxy to access the internet?</source>
<translation>Este computador precisa de um proxy para acessar a internet?</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="84"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="85"/>
<source>Proxy type:</source>
<translation>Tipo de proxy:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="89"/>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="91"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="90"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="92"/>
<source>None</source>
<translation>Nenhum</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="106"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="107"/>
<source>Address:</source>
<translation>Endereço:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="115"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="116"/>
<source>IP address or hostname</source>
<translation>Endereço IP ou nome do host</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="118"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="119"/>
<source>Port:</source>
<translation>Porta:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="129"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="130"/>
<source>Username:</source>
<translation>Usuário:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="139"/>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="149"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="140"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="150"/>
<source>Optional</source>
<translation>Opcional</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="142"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="143"/>
<source>Password:</source>
<translation>Senha:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="159"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="160"/>
<source>Does this computer's Internet connection go through a firewall that only allows connections to certain ports?</source>
<translation>A conexão à internet deste computador passa por um firewall que só permite conexões a certas portas?</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="170"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="171"/>
<source>Allowed ports:</source>
<translation>Portas permitidas:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="177"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="178"/>
<source>Example: 80,443</source>
<translation>Exemplo: 80,443</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="188"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="189"/>
<source>If this computer's Internet connection is censored, you will need to obtain and use bridge relays.</source>
<translation>Se a conexão à internet deste computador é censurada, você precisará obter e usar bridge relays.</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="197"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="198"/>
<source>Enter one or more bridge relays (one per line):</source>
<translation>Entre um ou mais bridge relays (um por linha):</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="212"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="213"/>
<source>Back</source>
<translation>Voltar</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="219"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="220"/>
<source>Connect</source>
<translation>Conectar</translation>
</message>
diff --git a/translation/ricochet_pt_BR.ts b/translation/ricochet_pt_PT.ts
similarity index 83%
copy from translation/ricochet_pt_BR.ts
copy to translation/ricochet_pt_PT.ts
index 34134a4..5279db3 100644
--- a/translation/ricochet_pt_BR.ts
+++ b/translation/ricochet_pt_PT.ts
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
-<TS version="2.1" language="pt_BR">
+<TS version="2.1" language="pt_PT">
<context>
<name>AboutPreferences</name>
<message>
@@ -15,7 +15,7 @@
<message>
<location filename="../src/ui/qml/AddContactDialog.qml" line="51"/>
<source>Share your Ricochet ID to allow connection requests</source>
- <translation>Compartilhe seu ID Ricochet para permitir pedidos de conexão</translation>
+ <translation>Partilhe o seu ID Ricochet para permitir pedidos de ligação</translation>
</message>
<message>
<location filename="../src/ui/qml/AddContactDialog.qml" line="107"/>
@@ -43,7 +43,7 @@
<message>
<location filename="../src/ui/qml/ContactActions.qml" line="48"/>
<source>Rename</source>
- <translation>Renomear</translation>
+ <translation>Mudar o nome</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactActions.qml" line="53"/>
@@ -54,27 +54,27 @@
<context>
<name>ContactIDField</name>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="40"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="41"/>
<source><b>%1</b> is already your contact</source>
- <translation><b>%1</b> já é seu contato</translation>
+ <translation><b>%1</b> já é um contacto seu</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="42"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="43"/>
<source>You can't add yourself as a contact</source>
- <translation>Você não pode adicionar a si mesmo como um contato</translation>
+ <translation>Não pode adicionar-se a si mesmo como contacto</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="44"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="45"/>
<source>Enter an ID starting with <b>ricochet:</b></source>
- <translation>Entre uma ID começando com <b>ricochet:</b></translation>
+ <translation>Insira um ID que comece com <b>ricochet:</b></translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="80"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="81"/>
<source>Copied to clipboard</source>
<translation>Copiado para a área de transferência</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="92"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="93"/>
<source>Copy</source>
<translation>Copiar</translation>
</message>
@@ -99,7 +99,7 @@
<message>
<location filename="../src/ui/qml/ContactList.qml" line="79"/>
<source>Rejected</source>
- <translation>Rejeitado</translation>
+ <translation>Rejeitados</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactList.qml" line="80"/>
@@ -112,7 +112,7 @@
<message>
<location filename="../src/ui/qml/ContactPreferences.qml" line="98"/>
<source>Date added:</source>
- <translation>Adicionado em:</translation>
+ <translation>Adicionado a:</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactPreferences.qml" line="106"/>
@@ -127,17 +127,17 @@
<message>
<location filename="../src/ui/qml/ContactPreferences.qml" line="126"/>
<source>Pending connection</source>
- <translation>Conexão pendente</translation>
+ <translation>Ligação pendente</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactPreferences.qml" line="127"/>
<source>Delivered</source>
- <translation>Entregue</translation>
+ <translation>Enviado</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactPreferences.qml" line="128"/>
<source>Accepted</source>
- <translation>Aceito</translation>
+ <translation>Aceite</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactPreferences.qml" line="129"/>
@@ -153,7 +153,7 @@
<location filename="../src/ui/qml/ContactPreferences.qml" line="134"/>
<source>%1 (Connected)</source>
<extracomment>%1 status, e.g. "Accepted"</extracomment>
- <translation>%1 (Conectado)</translation>
+ <translation>%1 (Ligado)</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactPreferences.qml" line="140"/>
@@ -163,7 +163,7 @@
<message>
<location filename="../src/ui/qml/ContactPreferences.qml" line="163"/>
<source>Rename</source>
- <translation>Renomear</translation>
+ <translation>Mudar o nome</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactPreferences.qml" line="170"/>
@@ -176,7 +176,7 @@
<message>
<location filename="../src/ui/qml/ContactRequestDialog.qml" line="55"/>
<source>Someone new is asking to connect to you</source>
- <translation>Alguém novo está pedindo para se conectar com você</translation>
+ <translation>Alguém novo está a pedir para se ligar a si</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactRequestDialog.qml" line="102"/>
@@ -210,37 +210,45 @@
<context>
<name>GeneralPreferences</name>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="12"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="13"/>
<source>Use a single window for conversations</source>
- <translation>Usar somente uma janela para conversas</translation>
+ <translation>Utilizar uma única janela para conversas</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="20"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="21"/>
<source>Open links in default browser without prompting</source>
<translation>Abrir links no navegador padrão sem pedir confirmação</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="28"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="29"/>
<source>Play audio notifications</source>
- <translation>Tocar notificações de áudio</translation>
+ <translation>Ativar notificações de áudio</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="37"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="38"/>
<source>Volume</source>
<translation>Volume</translation>
</message>
+ <message>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="53"/>
+ <source>Language</source>
+ <translation type="unfinished">Idioma</translation>
+ </message>
+ <message>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="76"/>
+ <source>Restart Ricochet to apply changes</source>
+ <translation type="unfinished">Reiniciar o Ricochet para aplicar as alterações</translation>
+ </message>
</context>
<context>
<name>LanguagePreferences</name>
<message>
- <location filename="../src/ui/qml/LanguagePreferences.qml" line="22"/>
<source>Select Language</source>
- <translation>Selecionar Linguagem</translation>
+ <translation type="vanished">Selecionar Idioma</translation>
</message>
<message>
- <location filename="../src/ui/qml/LanguagePreferences.qml" line="52"/>
<source>Restart Ricochet to apply changes</source>
- <translation>Reiniciar Ricochet para aplicar mudanças</translation>
+ <translation type="vanished">Reiniciar o Ricochet para aplicar as alterações</translation>
</message>
</context>
<context>
@@ -254,7 +262,7 @@
<context>
<name>Main</name>
<message>
- <location filename="../src/main.cpp" line="73"/>
+ <location filename="../src/main.cpp" line="81"/>
<source>Ricochet Error</source>
<translation>Erro do Ricochet</translation>
</message>
@@ -264,7 +272,7 @@
<message>
<location filename="../src/ui/qml/MainToolBar.qml" line="19"/>
<source>Add Contact</source>
- <translation>Adicionar Contato</translation>
+ <translation>Adicionar Contacto</translation>
</message>
<message>
<location filename="../src/ui/qml/MainToolBar.qml" line="28"/>
@@ -274,7 +282,7 @@
<message>
<location filename="../src/ui/qml/MainToolBar.qml" line="75"/>
<source>Click to add contacts</source>
- <translation>Clique para adicionar contatos</translation>
+ <translation>Clique para adicionar contactos</translation>
</message>
</context>
<context>
@@ -287,7 +295,7 @@
<message>
<location filename="../src/ui/MainWindow.cpp" line="192"/>
<source>Do you want to permanently remove %1?</source>
- <translation>Você deseja remover %1 permanentemente?</translation>
+ <translation>Deseja remover %1 permanentemente?</translation>
</message>
</context>
<context>
@@ -311,12 +319,12 @@
<message>
<location filename="../src/ui/qml/MessageDelegate.qml" line="140"/>
<source>Open with Browser</source>
- <translation>Abrir no Navegador</translation>
+ <translation>Abrir com o Navegador</translation>
</message>
<message>
<location filename="../src/ui/qml/MessageDelegate.qml" line="154"/>
<source>Add as Contact</source>
- <translation>Adicionar como Contato</translation>
+ <translation>Adicionar como Contacto</translation>
</message>
<message>
<location filename="../src/ui/qml/MessageDelegate.qml" line="166"/>
@@ -340,12 +348,12 @@
<location filename="../src/ui/qml/MessageDialogWrapper.qml" line="10"/>
<source>Do you want to permanently remove %1?</source>
<extracomment>%1 nickname</extracomment>
- <translation>Você deseja remover %1 permanentemente?</translation>
+ <translation>Deseja remover %1 permanentemente?</translation>
</message>
<message>
<location filename="../src/ui/qml/MessageDialogWrapper.qml" line="11"/>
<source>This contact will no longer be able to message you, and will be notified about the removal. They may choose to send a new connection request.</source>
- <translation>Este contato não poderá mais te enviar mensagens, e será notificado sobre a remoção. Ele pode escolher enviar novo pedido de conexão.</translation>
+ <translation>Este contacto deixará de lhe poder enviar mensagens, e será ainda notificado sobre a remoção. No entanto, este poderá enviar um novo pedido de ligação.</translation>
</message>
</context>
<context>
@@ -353,17 +361,17 @@
<message>
<location filename="../src/ui/qml/NetworkSetupWizard.qml" line="100"/>
<source>This computer's Internet connection is free of obstacles. I would like to connect directly to the Tor network.</source>
- <translation>A conexão à internet deste computador está livre de obstáculos. Quero me conectar diretamente à rede Tor.</translation>
+ <translation>A ligação à Internet deste computador está livre de obstáculos. Pretendo ligar-me diretamente à rede Tor.</translation>
</message>
<message>
<location filename="../src/ui/qml/NetworkSetupWizard.qml" line="107"/>
<source>Connect</source>
- <translation>Conectar</translation>
+ <translation>Ligar</translation>
</message>
<message>
<location filename="../src/ui/qml/NetworkSetupWizard.qml" line="124"/>
<source>This computer's Internet connection is censored, filtered, or proxied. I need to configure network settings.</source>
- <translation>A conexão à internet deste computador é censurada, filtrada, ou passa por proxy. Preciso configurar a rede.</translation>
+ <translation>A ligação à Internet deste computador é censurada, filtrada, ou passa por um proxy. Necessito de configurar as definições da rede.</translation>
</message>
<message>
<location filename="../src/ui/qml/NetworkSetupWizard.qml" line="131"/>
@@ -386,13 +394,13 @@
<message>
<location filename="../src/ui/qml/OfflineStateItem.qml" line="143"/>
<source>Connection failed</source>
- <translation>A conexão falhou</translation>
+ <translation>Ligação falhou</translation>
</message>
<message>
<location filename="../src/ui/qml/OfflineStateItem.qml" line="169"/>
<source>Connecting…</source>
<extracomment>\u2026 is ellipsis</extracomment>
- <translation>Conectando...</translation>
+ <translation>Ligando...</translation>
</message>
</context>
<context>
@@ -400,7 +408,7 @@
<message>
<location filename="../src/ui/qml/OpenBrowserDialog.qml" line="40"/>
<source><b>Warning!</b> Opening links with your default browser will harm your security and anonymity.<br><br>You can <a href='.'>copy to the clipboard</a> instead.</source>
- <translation><b>Atenção!</b> Abrir links com o seu navegador pode danificar sua segurança e anonimidade.<br><br>Ao invés disso, você pode <a href='.'>copiar para a área de transferência</a>.</translation>
+ <translation><b>Atenção!</b> Abrir links com o seu navegador padrão irá diminuir a sua segurança e anonimidade.<br><br>Em vez disso, poderá <a href='.'>copiar para a área de transferência</a>.</translation>
</message>
<message>
<location filename="../src/ui/qml/OpenBrowserDialog.qml" line="59"/>
@@ -436,22 +444,21 @@
<translation>Geral</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="46"/>
<source>Language</source>
- <translation>Idioma</translation>
+ <translation type="vanished">Idioma</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="51"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="46"/>
<source>Contacts</source>
- <translation>Contatos</translation>
+ <translation>Contactos</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="56"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="51"/>
<source>Tor</source>
<translation>Tor</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="61"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="56"/>
<source>About</source>
<translation>Sobre</translation>
</message>
@@ -469,7 +476,7 @@
<message>
<location filename="../src/ui/qml/StartupStatusPage.qml" line="18"/>
<source>The Tor process was not started successfully. This is most likely an installation or system error.</source>
- <translation>O processo do Tor não foi iniciado com sucesso. Muito provavelmente isso é um erro de instalação ou de sistema.</translation>
+ <translation>O processo do Tor não foi iniciado com sucesso. Tal deve-se, provavelmente, a um erro de instalação ou de sistema.</translation>
</message>
<message>
<location filename="../src/ui/qml/StartupStatusPage.qml" line="49"/>
@@ -483,7 +490,7 @@
<location filename="../src/ui/qml/TorBootstrapStatus.qml" line="17"/>
<source>Connecting to the Tor network…</source>
<extracomment>\u2026 is ellipsis</extracomment>
- <translation>Conectando à rede Tor...</translation>
+ <translation>A ligar à rede Tor...</translation>
</message>
<message>
<location filename="../src/ui/qml/TorBootstrapStatus.qml" line="51"/>
@@ -503,92 +510,92 @@
<message>
<location filename="../src/ui/qml/TorBootstrapStatus.qml" line="70"/>
<source>Done</source>
- <translation>Feito</translation>
+ <translation>Terminado</translation>
</message>
</context>
<context>
<name>TorConfigurationPage</name>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="72"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="73"/>
<source>Does this computer need a proxy to access the internet?</source>
- <translation>Este computador precisa de um proxy para acessar a internet?</translation>
+ <translation>Este computador necessita de um proxy para aceder à internet?</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="84"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="85"/>
<source>Proxy type:</source>
<translation>Tipo de proxy:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="89"/>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="91"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="90"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="92"/>
<source>None</source>
<translation>Nenhum</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="106"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="107"/>
<source>Address:</source>
<translation>Endereço:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="115"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="116"/>
<source>IP address or hostname</source>
- <translation>Endereço IP ou nome do host</translation>
+ <translation>Endereço de IP ou nome do host</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="118"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="119"/>
<source>Port:</source>
<translation>Porta:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="129"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="130"/>
<source>Username:</source>
- <translation>Usuário:</translation>
+ <translation>Nome de utilizador:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="139"/>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="149"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="140"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="150"/>
<source>Optional</source>
<translation>Opcional</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="142"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="143"/>
<source>Password:</source>
- <translation>Senha:</translation>
+ <translation>Palavra-passe:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="159"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="160"/>
<source>Does this computer's Internet connection go through a firewall that only allows connections to certain ports?</source>
- <translation>A conexão à internet deste computador passa por um firewall que só permite conexões a certas portas?</translation>
+ <translation>A ligação à Internet deste computador passa por uma firewall que apenas permite ligações por certas portas?</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="170"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="171"/>
<source>Allowed ports:</source>
<translation>Portas permitidas:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="177"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="178"/>
<source>Example: 80,443</source>
<translation>Exemplo: 80,443</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="188"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="189"/>
<source>If this computer's Internet connection is censored, you will need to obtain and use bridge relays.</source>
- <translation>Se a conexão à internet deste computador é censurada, você precisará obter e usar bridge relays.</translation>
+ <translation>Se a ligação à Internet deste computador é censurada, necessitará de obter e utilizar bridge relays.</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="197"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="198"/>
<source>Enter one or more bridge relays (one per line):</source>
- <translation>Entre um ou mais bridge relays (um por linha):</translation>
+ <translation>Insira um ou mais bridge relays (um por linha):</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="212"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="213"/>
<source>Back</source>
<translation>Voltar</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="219"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="220"/>
<source>Connect</source>
- <translation>Conectar</translation>
+ <translation>Ligar</translation>
</message>
</context>
<context>
@@ -596,7 +603,7 @@
<message>
<location filename="../src/ui/qml/TorPreferences.qml" line="25"/>
<source>Running:</source>
- <translation>Executando:</translation>
+ <translation>A correr:</translation>
</message>
<message>
<location filename="../src/ui/qml/TorPreferences.qml" line="26"/>
@@ -620,7 +627,7 @@
<message>
<location filename="../src/ui/qml/TorPreferences.qml" line="27"/>
<source>Control connected:</source>
- <translation>Controle conectado:</translation>
+ <translation>Controlo ligado:</translation>
</message>
<message>
<location filename="../src/ui/qml/TorPreferences.qml" line="29"/>
@@ -630,7 +637,7 @@
<message>
<location filename="../src/ui/qml/TorPreferences.qml" line="31"/>
<source>Hidden service:</source>
- <translation>Serviço escondido:</translation>
+ <translation>Serviço oculto:</translation>
</message>
<message>
<location filename="../src/ui/qml/TorPreferences.qml" line="32"/>
@@ -665,20 +672,20 @@
<location filename="../src/ui/qml/TorStateWidget.qml" line="9"/>
<location filename="../src/ui/qml/TorStateWidget.qml" line="20"/>
<source>Connection failed</source>
- <translation>A conexão falhou</translation>
+ <translation>Ligação falhou</translation>
</message>
<message>
<location filename="../src/ui/qml/TorStateWidget.qml" line="12"/>
<location filename="../src/ui/qml/TorStateWidget.qml" line="22"/>
<source>Connecting…</source>
<extracomment>\u2026 is ellipsis</extracomment>
- <translation>Conectando...</translation>
+ <translation>Ligando...</translation>
</message>
<message>
<location filename="../src/ui/qml/TorStateWidget.qml" line="25"/>
<source>Connecting… (%1%)</source>
<extracomment>%1 is progress percentage, e.g. 100</extracomment>
- <translation>Conectando... (%1)</translation>
+ <translation>Ligando... (%1%)</translation>
</message>
<message>
<location filename="../src/ui/qml/TorStateWidget.qml" line="32"/>
@@ -688,7 +695,7 @@
<message>
<location filename="../src/ui/qml/TorStateWidget.qml" line="34"/>
<source>Connected</source>
- <translation>Conectado</translation>
+ <translation>Ligado</translation>
</message>
</context>
</TS>
diff --git a/translation/ricochet_ru.ts b/translation/ricochet_ru.ts
index 7a3a1bb..443e704 100644
--- a/translation/ricochet_ru.ts
+++ b/translation/ricochet_ru.ts
@@ -54,27 +54,27 @@
<context>
<name>ContactIDField</name>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="40"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="41"/>
<source><b>%1</b> is already your contact</source>
<translation><b>%1</b> уже в Вашем списке контактов</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="42"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="43"/>
<source>You can't add yourself as a contact</source>
<translation>Вы не можете добавить себя в свой же список контактов</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="44"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="45"/>
<source>Enter an ID starting with <b>ricochet:</b></source>
<translation>Введите ID, начинающийся с <b>ricochet:</b></translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="80"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="81"/>
<source>Copied to clipboard</source>
<translation>Скопировано в буфер</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="92"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="93"/>
<source>Copy</source>
<translation>Копировать</translation>
</message>
@@ -210,35 +210,32 @@
<context>
<name>GeneralPreferences</name>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="12"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="13"/>
<source>Use a single window for conversations</source>
<translation>Использовать одно окно для разговоров</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="20"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="21"/>
<source>Open links in default browser without prompting</source>
<translation>Открывать ссылки в браузере по умолчанию без запроса</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="28"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="29"/>
<source>Play audio notifications</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="37"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="38"/>
<source>Volume</source>
<translation type="unfinished"></translation>
</message>
-</context>
-<context>
- <name>LanguagePreferences</name>
<message>
- <location filename="../src/ui/qml/LanguagePreferences.qml" line="22"/>
- <source>Select Language</source>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="53"/>
+ <source>Language</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/ui/qml/LanguagePreferences.qml" line="52"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="76"/>
<source>Restart Ricochet to apply changes</source>
<translation type="unfinished"></translation>
</message>
@@ -254,7 +251,7 @@
<context>
<name>Main</name>
<message>
- <location filename="../src/main.cpp" line="73"/>
+ <location filename="../src/main.cpp" line="81"/>
<source>Ricochet Error</source>
<translation>Ошибка Ricochet</translation>
</message>
@@ -437,21 +434,16 @@
</message>
<message>
<location filename="../src/ui/qml/PreferencesDialog.qml" line="46"/>
- <source>Language</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="51"/>
<source>Contacts</source>
<translation>Контакты</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="56"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="51"/>
<source>Tor</source>
<translation>Tor</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="61"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="56"/>
<source>About</source>
<translation>О программе</translation>
</message>
@@ -509,84 +501,84 @@
<context>
<name>TorConfigurationPage</name>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="72"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="73"/>
<source>Does this computer need a proxy to access the internet?</source>
<translation>Этот компьютер использует прокси для доступа в Интернет?</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="84"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="85"/>
<source>Proxy type:</source>
<translation>Тип прокси:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="89"/>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="91"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="90"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="92"/>
<source>None</source>
<translation>Нет</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="106"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="107"/>
<source>Address:</source>
<translation>Адрес:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="115"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="116"/>
<source>IP address or hostname</source>
<translation>IP адрес или имя хоста</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="118"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="119"/>
<source>Port:</source>
<translation>Порт:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="129"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="130"/>
<source>Username:</source>
<translation>Имя пользователя:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="139"/>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="149"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="140"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="150"/>
<source>Optional</source>
<translation>Необязательно</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="142"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="143"/>
<source>Password:</source>
<translation>Пароль:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="159"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="160"/>
<source>Does this computer's Internet connection go through a firewall that only allows connections to certain ports?</source>
<translation>Соединение данного компьютера фильтруется фаерволом, который разрешает доступ только к определенным портам?</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="170"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="171"/>
<source>Allowed ports:</source>
<translation>Открытые порты:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="177"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="178"/>
<source>Example: 80,443</source>
<translation>Например: 80,443</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="188"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="189"/>
<source>If this computer's Internet connection is censored, you will need to obtain and use bridge relays.</source>
<translation>Если соединение этого компьютера подвергается цензуре, Вам необходимо получить и использовать ретрансляторы Tor.</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="197"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="198"/>
<source>Enter one or more bridge relays (one per line):</source>
<translation>Введите один ретранслятор или более (по одному на строку):</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="212"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="213"/>
<source>Back</source>
<translation>Назад</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="219"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="220"/>
<source>Connect</source>
<translation>Соединить</translation>
</message>
diff --git a/translation/ricochet_sl.ts b/translation/ricochet_sl.ts
index 66d7078..2c3e885 100644
--- a/translation/ricochet_sl.ts
+++ b/translation/ricochet_sl.ts
@@ -1,4 +1,6 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="sl" version="2.1">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="sl">
<context>
<name>AboutPreferences</name>
<message>
@@ -52,27 +54,27 @@
<context>
<name>ContactIDField</name>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="40"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="41"/>
<source><b>%1</b> is already your contact</source>
<translation><b>%1</b> je že med stiki</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="42"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="43"/>
<source>You can't add yourself as a contact</source>
<translation>Sebe ne moreš dodati med stike</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="44"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="45"/>
<source>Enter an ID starting with <b>ricochet:</b></source>
<translation>Vnesi ID, tako da začneš vnos z <b>ricochet:</b></translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="79"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="81"/>
<source>Copied to clipboard</source>
<translation>Kopirano v odložišče</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="91"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="93"/>
<source>Copy</source>
<translation>Kopiraj</translation>
</message>
@@ -80,27 +82,27 @@
<context>
<name>ContactList</name>
<message>
- <location filename="../src/ui/qml/ContactList.qml" line="75"/>
+ <location filename="../src/ui/qml/ContactList.qml" line="76"/>
<source>Online</source>
<translation>Povezan</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactList.qml" line="76"/>
+ <location filename="../src/ui/qml/ContactList.qml" line="77"/>
<source>Offline</source>
<translation>Brez povezave</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactList.qml" line="77"/>
+ <location filename="../src/ui/qml/ContactList.qml" line="78"/>
<source>Requests</source>
<translation>Zahteve</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactList.qml" line="78"/>
+ <location filename="../src/ui/qml/ContactList.qml" line="79"/>
<source>Rejected</source>
<translation>Zavrnjeno</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactList.qml" line="79"/>
+ <location filename="../src/ui/qml/ContactList.qml" line="80"/>
<source>Outdated</source>
<translation>Zastarelo</translation>
</message>
@@ -108,63 +110,63 @@
<context>
<name>ContactPreferences</name>
<message>
- <location filename="../src/ui/qml/ContactPreferences.qml" line="97"/>
+ <location filename="../src/ui/qml/ContactPreferences.qml" line="98"/>
<source>Date added:</source>
<translation>Dodan datum:</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactPreferences.qml" line="104"/>
+ <location filename="../src/ui/qml/ContactPreferences.qml" line="106"/>
<source>Last seen:</source>
<translation>Nazadnje viden:</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactPreferences.qml" line="113"/>
+ <location filename="../src/ui/qml/ContactPreferences.qml" line="116"/>
<source>Request:</source>
<translation>Zahteva:</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactPreferences.qml" line="122"/>
+ <location filename="../src/ui/qml/ContactPreferences.qml" line="126"/>
<source>Pending connection</source>
<translation>Povezovanje je v teku</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactPreferences.qml" line="123"/>
+ <location filename="../src/ui/qml/ContactPreferences.qml" line="127"/>
<source>Delivered</source>
<translation>Dostavljeno</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactPreferences.qml" line="124"/>
+ <location filename="../src/ui/qml/ContactPreferences.qml" line="128"/>
<source>Accepted</source>
<translation>Sprejeto</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactPreferences.qml" line="125"/>
+ <location filename="../src/ui/qml/ContactPreferences.qml" line="129"/>
<source>Error</source>
<translation>Napaka</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactPreferences.qml" line="126"/>
+ <location filename="../src/ui/qml/ContactPreferences.qml" line="130"/>
<source>Rejected</source>
<translation>Zavrnjeno</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactPreferences.qml" line="130"/>
+ <location filename="../src/ui/qml/ContactPreferences.qml" line="134"/>
<source>%1 (Connected)</source>
<extracomment>%1 status, e.g. "Accepted"</extracomment>
<translation>%1 (Povezan)</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactPreferences.qml" line="136"/>
+ <location filename="../src/ui/qml/ContactPreferences.qml" line="140"/>
<source>Response:</source>
<translation>Odgovor:</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactPreferences.qml" line="158"/>
+ <location filename="../src/ui/qml/ContactPreferences.qml" line="163"/>
<source>Rename</source>
<translation>Preimenuj</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactPreferences.qml" line="165"/>
+ <location filename="../src/ui/qml/ContactPreferences.qml" line="170"/>
<source>Remove</source>
<translation>Odstrani</translation>
</message>
@@ -208,37 +210,45 @@
<context>
<name>GeneralPreferences</name>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="12"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="13"/>
<source>Use a single window for conversations</source>
<translation>Uporabljaj enotno okno za pogovore</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="20"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="21"/>
<source>Open links in default browser without prompting</source>
<translation>Brez spraševanja odpri povezave v privzetem brskalniku</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="28"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="29"/>
<source>Play audio notifications</source>
<translation>Predvajaj zvočna obvestila </translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="37"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="38"/>
<source>Volume</source>
<translation>Glasnost</translation>
</message>
+ <message>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="53"/>
+ <source>Language</source>
+ <translation type="unfinished">Jezik</translation>
+ </message>
+ <message>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="76"/>
+ <source>Restart Ricochet to apply changes</source>
+ <translation type="unfinished">Za uveljavitev sprememb ponovno zaženite Ricochet</translation>
+ </message>
</context>
<context>
<name>LanguagePreferences</name>
<message>
- <location filename="../src/ui/qml/LanguagePreferences.qml" line="22"/>
<source>Select Language</source>
- <translation>Izberi jezik</translation>
+ <translation type="vanished">Izberi jezik</translation>
</message>
<message>
- <location filename="../src/ui/qml/LanguagePreferences.qml" line="52"/>
<source>Restart Ricochet to apply changes</source>
- <translation>Za uveljavitev sprememb ponovno zaženite Ricochet</translation>
+ <translation type="vanished">Za uveljavitev sprememb ponovno zaženite Ricochet</translation>
</message>
</context>
<context>
@@ -252,7 +262,7 @@
<context>
<name>Main</name>
<message>
- <location filename="../src/main.cpp" line="73"/>
+ <location filename="../src/main.cpp" line="81"/>
<source>Ricochet Error</source>
<translation>Napaka Ricochet</translation>
</message>
@@ -278,12 +288,12 @@
<context>
<name>MainWindow</name>
<message>
- <location filename="../src/ui/MainWindow.cpp" line="153"/>
+ <location filename="../src/ui/MainWindow.cpp" line="191"/>
<source>Remove %1</source>
<translation>Odstrani %1</translation>
</message>
<message>
- <location filename="../src/ui/MainWindow.cpp" line="154"/>
+ <location filename="../src/ui/MainWindow.cpp" line="192"/>
<source>Do you want to permanently remove %1?</source>
<translation>Ali želte za vselej odstraniti %1?</translation>
</message>
@@ -297,32 +307,32 @@
<translation>%1 ni povezan</translation>
</message>
<message>
- <location filename="../src/ui/qml/MessageDelegate.qml" line="134"/>
+ <location filename="../src/ui/qml/MessageDelegate.qml" line="135"/>
<source>Copy ID</source>
<translation>Kopiraj ID</translation>
</message>
<message>
- <location filename="../src/ui/qml/MessageDelegate.qml" line="134"/>
+ <location filename="../src/ui/qml/MessageDelegate.qml" line="135"/>
<source>Copy Link</source>
<translation>Kopiraj povezavo</translation>
</message>
<message>
- <location filename="../src/ui/qml/MessageDelegate.qml" line="139"/>
+ <location filename="../src/ui/qml/MessageDelegate.qml" line="140"/>
<source>Open with Browser</source>
<translation>Odpri z brskalnikom</translation>
</message>
<message>
- <location filename="../src/ui/qml/MessageDelegate.qml" line="153"/>
+ <location filename="../src/ui/qml/MessageDelegate.qml" line="154"/>
<source>Add as Contact</source>
<translation>Dodaj kot stik</translation>
</message>
<message>
- <location filename="../src/ui/qml/MessageDelegate.qml" line="165"/>
+ <location filename="../src/ui/qml/MessageDelegate.qml" line="166"/>
<source>Copy Message</source>
<translation>Kopiraj sporočilo</translation>
</message>
<message>
- <location filename="../src/ui/qml/MessageDelegate.qml" line="172"/>
+ <location filename="../src/ui/qml/MessageDelegate.qml" line="173"/>
<source>Copy Selection</source>
<translation>Kopiraj izbor</translation>
</message>
@@ -330,18 +340,18 @@
<context>
<name>MessageDialogWrapper</name>
<message>
- <location filename="../src/ui/qml/MessageDialogWrapper.qml" line="7"/>
+ <location filename="../src/ui/qml/MessageDialogWrapper.qml" line="8"/>
<source>Remove %1</source>
<translation>Odstrani %1</translation>
</message>
<message>
- <location filename="../src/ui/qml/MessageDialogWrapper.qml" line="9"/>
+ <location filename="../src/ui/qml/MessageDialogWrapper.qml" line="10"/>
<source>Do you want to permanently remove %1?</source>
<extracomment>%1 nickname</extracomment>
<translation>Ali želte za vselej odstraniti %1?</translation>
</message>
<message>
- <location filename="../src/ui/qml/MessageDialogWrapper.qml" line="10"/>
+ <location filename="../src/ui/qml/MessageDialogWrapper.qml" line="11"/>
<source>This contact will no longer be able to message you, and will be notified about the removal. They may choose to send a new connection request.</source>
<translation>Ta oseba vam ne bo mogla več pošiljati sporočil in bo obveščena o odstranitvi z vašega seznama. Lahko vam pošlje novo zahtevo za povezavo.</translation>
</message>
@@ -396,27 +406,27 @@
<context>
<name>OpenBrowserDialog</name>
<message>
- <location filename="../src/ui/qml/OpenBrowserDialog.qml" line="39"/>
+ <location filename="../src/ui/qml/OpenBrowserDialog.qml" line="40"/>
<source><b>Warning!</b> Opening links with your default browser will harm your security and anonymity.<br><br>You can <a href='.'>copy to the clipboard</a> instead.</source>
<translation><b>Pozor!</b> Odpiranje povezav s privzetim brskalnikom škoduje vaši zasebnosti in varnosti.<br><br>Lahko pa jih namesto tega<a href='.'>prekopirate v odložišče</a>.</translation>
</message>
<message>
- <location filename="../src/ui/qml/OpenBrowserDialog.qml" line="58"/>
+ <location filename="../src/ui/qml/OpenBrowserDialog.qml" line="59"/>
<source>Don't ask again for links from %1</source>
<translation>Ne sprašuj več za povezavo z %1</translation>
</message>
<message>
- <location filename="../src/ui/qml/OpenBrowserDialog.qml" line="64"/>
+ <location filename="../src/ui/qml/OpenBrowserDialog.qml" line="65"/>
<source>Don't ask again for any links (not recommended!)</source>
<translation>Ne sprašuj več za nobeno povezavo (ni priporočljivo!)</translation>
</message>
<message>
- <location filename="../src/ui/qml/OpenBrowserDialog.qml" line="71"/>
+ <location filename="../src/ui/qml/OpenBrowserDialog.qml" line="72"/>
<source>Open Browser</source>
<translation>Odpri brskalnik</translation>
</message>
<message>
- <location filename="../src/ui/qml/OpenBrowserDialog.qml" line="83"/>
+ <location filename="../src/ui/qml/OpenBrowserDialog.qml" line="84"/>
<source>Cancel</source>
<translation>Prekliči</translation>
</message>
@@ -434,22 +444,21 @@
<translation>Splošno</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="46"/>
<source>Language</source>
- <translation>Jezik</translation>
+ <translation type="vanished">Jezik</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="51"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="46"/>
<source>Contacts</source>
<translation>Stiki</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="56"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="51"/>
<source>Tor</source>
<translation>Tor</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="61"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="56"/>
<source>About</source>
<translation>Več o</translation>
</message>
@@ -484,22 +493,22 @@
<translation>Povezujem se z omrežjem Tor...</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorBootstrapStatus.qml" line="50"/>
+ <location filename="../src/ui/qml/TorBootstrapStatus.qml" line="51"/>
<source>Back</source>
<translation>Nazaj</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorBootstrapStatus.qml" line="57"/>
+ <location filename="../src/ui/qml/TorBootstrapStatus.qml" line="58"/>
<source>Hide details</source>
<translation>Skrij podrobnosti</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorBootstrapStatus.qml" line="57"/>
+ <location filename="../src/ui/qml/TorBootstrapStatus.qml" line="58"/>
<source>Show details</source>
<translation>Prikaži podrobnosti</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorBootstrapStatus.qml" line="69"/>
+ <location filename="../src/ui/qml/TorBootstrapStatus.qml" line="70"/>
<source>Done</source>
<translation>Izvršeno</translation>
</message>
@@ -507,84 +516,84 @@
<context>
<name>TorConfigurationPage</name>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="72"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="73"/>
<source>Does this computer need a proxy to access the internet?</source>
<translation>Potrebuje ta računalnik proksi za dostop do medmrežja?</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="84"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="85"/>
<source>Proxy type:</source>
<translation>Vrsta proksija:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="89"/>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="91"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="90"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="92"/>
<source>None</source>
<translation>Brez</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="106"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="107"/>
<source>Address:</source>
<translation>Naslov</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="115"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="116"/>
<source>IP address or hostname</source>
<translation>Naslov IP ali ime gostitelja</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="118"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="119"/>
<source>Port:</source>
<translation>Vrata:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="129"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="130"/>
<source>Username:</source>
<translation>Uporabniško ime:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="139"/>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="149"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="140"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="150"/>
<source>Optional</source>
<translation>Izbirno</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="142"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="143"/>
<source>Password:</source>
<translation>Geslo:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="159"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="160"/>
<source>Does this computer's Internet connection go through a firewall that only allows connections to certain ports?</source>
<translation>Ali poteka povezava tega računalnika z medmrežjem čez požarni zid, ki dovoljuje povezavo le skozi določena vrata?</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="170"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="171"/>
<source>Allowed ports:</source>
<translation>Dovoljena vrata:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="177"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="178"/>
<source>Example: 80,443</source>
<translation>Primer: 80,443</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="188"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="189"/>
<source>If this computer's Internet connection is censored, you will need to obtain and use bridge relays.</source>
<translation>Če je povezava tega računalnika z medmrežjem cenzurirana, morate pridobiti posredniške mostove - bridge relays.</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="197"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="198"/>
<source>Enter one or more bridge relays (one per line):</source>
<translation>Vnesite enega ali več posredniških mostov (enega na vrstico):</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="212"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="213"/>
<source>Back</source>
<translation>Nazaj</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="219"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="220"/>
<source>Connect</source>
<translation>Poveži se</translation>
</message>
@@ -592,67 +601,67 @@
<context>
<name>TorPreferences</name>
<message>
- <location filename="../src/ui/qml/TorPreferences.qml" line="24"/>
+ <location filename="../src/ui/qml/TorPreferences.qml" line="25"/>
<source>Running:</source>
<translation>Teče:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorPreferences.qml" line="25"/>
- <location filename="../src/ui/qml/TorPreferences.qml" line="27"/>
- <location filename="../src/ui/qml/TorPreferences.qml" line="29"/>
+ <location filename="../src/ui/qml/TorPreferences.qml" line="26"/>
+ <location filename="../src/ui/qml/TorPreferences.qml" line="28"/>
+ <location filename="../src/ui/qml/TorPreferences.qml" line="30"/>
<source>Yes</source>
<translation>Da</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorPreferences.qml" line="25"/>
- <location filename="../src/ui/qml/TorPreferences.qml" line="27"/>
- <location filename="../src/ui/qml/TorPreferences.qml" line="29"/>
+ <location filename="../src/ui/qml/TorPreferences.qml" line="26"/>
+ <location filename="../src/ui/qml/TorPreferences.qml" line="28"/>
+ <location filename="../src/ui/qml/TorPreferences.qml" line="30"/>
<source>No</source>
<translation>Ne</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorPreferences.qml" line="25"/>
+ <location filename="../src/ui/qml/TorPreferences.qml" line="26"/>
<source>External</source>
<translation>Zunanje</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorPreferences.qml" line="26"/>
+ <location filename="../src/ui/qml/TorPreferences.qml" line="27"/>
<source>Control connected:</source>
<translation>Nadzorno povezan:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorPreferences.qml" line="28"/>
+ <location filename="../src/ui/qml/TorPreferences.qml" line="29"/>
<source>Circuits established:</source>
<translation>Vzpostavljen krog:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorPreferences.qml" line="30"/>
+ <location filename="../src/ui/qml/TorPreferences.qml" line="31"/>
<source>Hidden service:</source>
<translation>Skrite storitve:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorPreferences.qml" line="31"/>
+ <location filename="../src/ui/qml/TorPreferences.qml" line="32"/>
<source>Online</source>
<translation>Povezan</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorPreferences.qml" line="31"/>
+ <location filename="../src/ui/qml/TorPreferences.qml" line="32"/>
<source>Offline</source>
<translation>Brez povezave</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorPreferences.qml" line="32"/>
+ <location filename="../src/ui/qml/TorPreferences.qml" line="33"/>
<source>Version:</source>
<translation>Različica:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorPreferences.qml" line="59"/>
+ <location filename="../src/ui/qml/TorPreferences.qml" line="60"/>
<source>Error: <b>%1</b></source>
<extracomment>%1 is error message</extracomment>
<translation>Napaka: <b>%1</b></translation>
</message>
<message>
- <location filename="../src/ui/qml/TorPreferences.qml" line="75"/>
+ <location filename="../src/ui/qml/TorPreferences.qml" line="76"/>
<source>Configure</source>
<translation>Nastavi</translation>
</message>
@@ -689,4 +698,4 @@
<translation>Povezan</translation>
</message>
</context>
-</TS>
\ No newline at end of file
+</TS>
diff --git a/translation/ricochet_sv.ts b/translation/ricochet_sq.ts
similarity index 71%
copy from translation/ricochet_sv.ts
copy to translation/ricochet_sq.ts
index 72c5514..d155e1a 100644
--- a/translation/ricochet_sv.ts
+++ b/translation/ricochet_sq.ts
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
-<TS version="2.1" language="sv">
+<TS version="2.1" language="sq">
<context>
<name>AboutPreferences</name>
<message>
@@ -15,17 +15,17 @@
<message>
<location filename="../src/ui/qml/AddContactDialog.qml" line="51"/>
<source>Share your Ricochet ID to allow connection requests</source>
- <translation>Dela ditt Ricochet-ID så att du kan ta emot förfrågningar</translation>
+ <translation>Ndani me të tjerët ID-në tuaj Ricochet që të lejoni kërkesa lidhjesh</translation>
</message>
<message>
<location filename="../src/ui/qml/AddContactDialog.qml" line="107"/>
<source>Cancel</source>
- <translation>Avbryt</translation>
+ <translation>Anulojeni</translation>
</message>
<message>
<location filename="../src/ui/qml/AddContactDialog.qml" line="112"/>
<source>Add</source>
- <translation>Lägg till</translation>
+ <translation>Shtoje</translation>
</message>
</context>
<context>
@@ -33,50 +33,50 @@
<message>
<location filename="../src/ui/qml/ContactActions.qml" line="40"/>
<source>Open Window</source>
- <translation>Öppna fönster</translation>
+ <translation>Hap Dritare</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactActions.qml" line="44"/>
<source>Details...</source>
- <translation>Detaljer...</translation>
+ <translation>Hollësi…</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactActions.qml" line="48"/>
<source>Rename</source>
- <translation>Ändra namn</translation>
+ <translation>Riemërtojeni</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactActions.qml" line="53"/>
<source>Remove</source>
- <translation>Ta bort</translation>
+ <translation>Hiqe</translation>
</message>
</context>
<context>
<name>ContactIDField</name>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="40"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="41"/>
<source><b>%1</b> is already your contact</source>
- <translation><b>%1</b> finns redan bland dina kontakter</translation>
+ <translation><b>%1</b> është tashmë kontakt i juaji</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="42"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="43"/>
<source>You can't add yourself as a contact</source>
- <translation>Du kan inte lägga till dig själv som kontakt</translation>
+ <translation>S’mund të shtoni veten si kontakt</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="44"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="45"/>
<source>Enter an ID starting with <b>ricochet:</b></source>
- <translation>Fyll i ett ID som startar med <b>ricochet:</b></translation>
+ <translation>Jepni një ID që fillon me <b>ricochet:</b></translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="80"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="81"/>
<source>Copied to clipboard</source>
- <translation>Kopierat till Urklipp</translation>
+ <translation>U kopjua në të papastër</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="92"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="93"/>
<source>Copy</source>
- <translation>Kopiera</translation>
+ <translation>Kopjoje</translation>
</message>
</context>
<context>
@@ -84,27 +84,27 @@
<message>
<location filename="../src/ui/qml/ContactList.qml" line="76"/>
<source>Online</source>
- <translation>Online</translation>
+ <translation>Në linjë</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactList.qml" line="77"/>
<source>Offline</source>
- <translation>Offline</translation>
+ <translation>Jo në linjë</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactList.qml" line="78"/>
<source>Requests</source>
- <translation>Förfrågningar</translation>
+ <translation>Kërkesa</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactList.qml" line="79"/>
<source>Rejected</source>
- <translation>Nekad</translation>
+ <translation>E hedhur tej</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactList.qml" line="80"/>
<source>Outdated</source>
- <translation>Inaktuell</translation>
+ <translation>E vjetruar</translation>
</message>
</context>
<context>
@@ -112,63 +112,63 @@
<message>
<location filename="../src/ui/qml/ContactPreferences.qml" line="98"/>
<source>Date added:</source>
- <translation>Tillagd datum:</translation>
+ <translation>Datë shtimi:</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactPreferences.qml" line="106"/>
<source>Last seen:</source>
- <translation>Sågs senast:</translation>
+ <translation>Parë së fundi më:</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactPreferences.qml" line="116"/>
<source>Request:</source>
- <translation>Förfrågan:</translation>
+ <translation>Kërkesë:</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactPreferences.qml" line="126"/>
<source>Pending connection</source>
- <translation>Inväntar anslutning</translation>
+ <translation>Lidhje në pritje të pranimit</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactPreferences.qml" line="127"/>
<source>Delivered</source>
- <translation>Levererad</translation>
+ <translation>Të dërguar</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactPreferences.qml" line="128"/>
<source>Accepted</source>
- <translation>Godkänd</translation>
+ <translation>Të pranuara</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactPreferences.qml" line="129"/>
<source>Error</source>
- <translation>Fel</translation>
+ <translation>Gabim</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactPreferences.qml" line="130"/>
<source>Rejected</source>
- <translation>Nekad</translation>
+ <translation>E hedhur tej</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactPreferences.qml" line="134"/>
<source>%1 (Connected)</source>
<extracomment>%1 status, e.g. "Accepted"</extracomment>
- <translation>%1 (Ansluten)</translation>
+ <translation>%1 (I lidhur)</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactPreferences.qml" line="140"/>
<source>Response:</source>
- <translation>Svar:</translation>
+ <translation>Përgjigje:</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactPreferences.qml" line="163"/>
<source>Rename</source>
- <translation>Ändra namn</translation>
+ <translation>Riemërtojeni</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactPreferences.qml" line="170"/>
<source>Remove</source>
- <translation>Ta bort</translation>
+ <translation>Hiqe</translation>
</message>
</context>
<context>
@@ -176,17 +176,17 @@
<message>
<location filename="../src/ui/qml/ContactRequestDialog.qml" line="55"/>
<source>Someone new is asking to connect to you</source>
- <translation>Någon ber att få kontakt med dig</translation>
+ <translation>Dikush i ri po kërkon të lidhet me ju</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactRequestDialog.qml" line="102"/>
<source>Reject</source>
- <translation>Avböj</translation>
+ <translation>Hidheni tej</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactRequestDialog.qml" line="107"/>
<source>Accept</source>
- <translation>Acceptera</translation>
+ <translation>Pranojeni</translation>
</message>
</context>
<context>
@@ -199,48 +199,56 @@
<message>
<location filename="../src/ui/qml/ContactRequestFields.qml" line="29"/>
<source>Name:</source>
- <translation>Namn:</translation>
+ <translation>Emër:</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactRequestFields.qml" line="40"/>
<source>Message:</source>
- <translation>Meddelande:</translation>
+ <translation>Mesazh:</translation>
</message>
</context>
<context>
<name>GeneralPreferences</name>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="12"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="13"/>
<source>Use a single window for conversations</source>
- <translation>Använd bara ett fönster för konversationer</translation>
+ <translation>Përdor një dritare të vetme për bisedat</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="20"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="21"/>
<source>Open links in default browser without prompting</source>
- <translation>Öppna länkar i standardwebbläsaren utan att fråga</translation>
+ <translation>Hapi lidhjet në shfletuesin parazgjedhje, pa pyetur</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="28"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="29"/>
<source>Play audio notifications</source>
- <translation>Spela ljudnotiser</translation>
+ <translation>Luaji njoftimet audion</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="37"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="38"/>
<source>Volume</source>
- <translation>Volym</translation>
+ <translation>Volum</translation>
+ </message>
+ <message>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="53"/>
+ <source>Language</source>
+ <translation type="unfinished">Gjuhë</translation>
+ </message>
+ <message>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="76"/>
+ <source>Restart Ricochet to apply changes</source>
+ <translation type="unfinished">Riniseni Ricochet-in që të zbatohen ndryshimet</translation>
</message>
</context>
<context>
<name>LanguagePreferences</name>
<message>
- <location filename="../src/ui/qml/LanguagePreferences.qml" line="22"/>
<source>Select Language</source>
- <translation>Välj språk</translation>
+ <translation type="vanished">Përzgjidhni Gjuhë</translation>
</message>
<message>
- <location filename="../src/ui/qml/LanguagePreferences.qml" line="52"/>
<source>Restart Ricochet to apply changes</source>
- <translation>Starta om Ricochet för att aktivera ändringarna</translation>
+ <translation type="vanished">Riniseni Ricochet-in që të zbatohen ndryshimet</translation>
</message>
</context>
<context>
@@ -248,15 +256,15 @@
<message>
<location filename="../src/ui/LanguagesModel.cpp" line="43"/>
<source>System default</source>
- <translation>Systemets standardval</translation>
+ <translation>Parazgjedhje sistemi</translation>
</message>
</context>
<context>
<name>Main</name>
<message>
- <location filename="../src/main.cpp" line="73"/>
+ <location filename="../src/main.cpp" line="81"/>
<source>Ricochet Error</source>
- <translation>Ricochet fel</translation>
+ <translation>Gabim Ricochet-i</translation>
</message>
</context>
<context>
@@ -264,17 +272,17 @@
<message>
<location filename="../src/ui/qml/MainToolBar.qml" line="19"/>
<source>Add Contact</source>
- <translation>Lägg till kontakt</translation>
+ <translation>Shtoni Kontakt</translation>
</message>
<message>
<location filename="../src/ui/qml/MainToolBar.qml" line="28"/>
<source>Preferences</source>
- <translation>Inställningar</translation>
+ <translation>Parapëlqime</translation>
</message>
<message>
<location filename="../src/ui/qml/MainToolBar.qml" line="75"/>
<source>Click to add contacts</source>
- <translation>Klicka för att lägga till kontakter</translation>
+ <translation>Klikoni që të shtoni kontakte</translation>
</message>
</context>
<context>
@@ -282,12 +290,12 @@
<message>
<location filename="../src/ui/MainWindow.cpp" line="191"/>
<source>Remove %1</source>
- <translation>Ta bort %1</translation>
+ <translation>Hiqe</translation>
</message>
<message>
<location filename="../src/ui/MainWindow.cpp" line="192"/>
<source>Do you want to permanently remove %1?</source>
- <translation>Vill du ta bort %1 permanent?</translation>
+ <translation>Doni të hiqet %1 përgjithmonë?</translation>
</message>
</context>
<context>
@@ -296,37 +304,37 @@
<location filename="../src/ui/qml/MessageDelegate.qml" line="26"/>
<source>%1 is offline</source>
<extracomment>%1 nickname</extracomment>
- <translation>%1 är offline</translation>
+ <translation>%1 s’është në linjë</translation>
</message>
<message>
<location filename="../src/ui/qml/MessageDelegate.qml" line="135"/>
<source>Copy ID</source>
- <translation>Kopiera ID</translation>
+ <translation>Kopjo ID-në</translation>
</message>
<message>
<location filename="../src/ui/qml/MessageDelegate.qml" line="135"/>
<source>Copy Link</source>
- <translation>Kopiera länk</translation>
+ <translation>Kopjo Lidhjen</translation>
</message>
<message>
<location filename="../src/ui/qml/MessageDelegate.qml" line="140"/>
<source>Open with Browser</source>
- <translation>Öppna med webbläsare</translation>
+ <translation>Hape me Shfletues</translation>
</message>
<message>
<location filename="../src/ui/qml/MessageDelegate.qml" line="154"/>
<source>Add as Contact</source>
- <translation>Lägg till som kontakt</translation>
+ <translation>Shtojeni si Kontakt</translation>
</message>
<message>
<location filename="../src/ui/qml/MessageDelegate.qml" line="166"/>
<source>Copy Message</source>
- <translation>Kopiera meddelande</translation>
+ <translation>Kopjo Mesazhin</translation>
</message>
<message>
<location filename="../src/ui/qml/MessageDelegate.qml" line="173"/>
<source>Copy Selection</source>
- <translation>Kopiera markering</translation>
+ <translation>Kopjo Përzgjedhjen</translation>
</message>
</context>
<context>
@@ -334,18 +342,18 @@
<message>
<location filename="../src/ui/qml/MessageDialogWrapper.qml" line="8"/>
<source>Remove %1</source>
- <translation>Ta bort %1</translation>
+ <translation>Hiqe %1</translation>
</message>
<message>
<location filename="../src/ui/qml/MessageDialogWrapper.qml" line="10"/>
<source>Do you want to permanently remove %1?</source>
<extracomment>%1 nickname</extracomment>
- <translation>Vill du ta bort %1 permanent?</translation>
+ <translation>Doni të hiqet %1 përgjithmonë?</translation>
</message>
<message>
<location filename="../src/ui/qml/MessageDialogWrapper.qml" line="11"/>
<source>This contact will no longer be able to message you, and will be notified about the removal. They may choose to send a new connection request.</source>
- <translation>Den här kontakten kommer inte längre att kunna skicka meddelanden till dig, och kommer att bli informerad om borttagningen. Kontakten kan välja att skicka en ny förfrågan.</translation>
+ <translation>Ky kontakt s’do të jetë më në gjendje t’ju dërgojë mesazhe, dhe do të njoftohet për heqjen. Ai mund të zgjedhë t’ju dërgojë një kërkesë të re lidhjeje.</translation>
</message>
</context>
<context>
@@ -353,22 +361,22 @@
<message>
<location filename="../src/ui/qml/NetworkSetupWizard.qml" line="100"/>
<source>This computer's Internet connection is free of obstacles. I would like to connect directly to the Tor network.</source>
- <translation>Den här datorn kan ansluta till Internet obehindrat. Jag vill ansluta direkt till Tor-nätverket.</translation>
+ <translation>Lidhja në Internet e këtij kompjuteri është pa pengesa. Do të doja të lidhem drejtpërsëdrejti me rrjetin Tor.</translation>
</message>
<message>
<location filename="../src/ui/qml/NetworkSetupWizard.qml" line="107"/>
<source>Connect</source>
- <translation>Anslut</translation>
+ <translation>Lidhu</translation>
</message>
<message>
<location filename="../src/ui/qml/NetworkSetupWizard.qml" line="124"/>
<source>This computer's Internet connection is censored, filtered, or proxied. I need to configure network settings.</source>
- <translation>Den här datorns Internetanslutning är censurerad, filtrerad eller kräver användning av en proxy. Jag behöver konfigurera nätverksinställningarna.</translation>
+ <translation>Lidhja në Internet e këtij kompjuteri është e censuruar, e filtruar ose bëhet përmes një ndërmjetësi. Kam nevojë të formësoj rregullime rrjeti.</translation>
</message>
<message>
<location filename="../src/ui/qml/NetworkSetupWizard.qml" line="131"/>
<source>Configure</source>
- <translation>Konfigurera</translation>
+ <translation>Formësojeni</translation>
</message>
</context>
<context>
@@ -376,23 +384,23 @@
<message>
<location filename="../src/ui/qml/OfflineStateItem.qml" line="107"/>
<source>Configure</source>
- <translation>Konfigurera</translation>
+ <translation>Formësojeni</translation>
</message>
<message>
<location filename="../src/ui/qml/OfflineStateItem.qml" line="115"/>
<source>Details</source>
- <translation>Detaljer</translation>
+ <translation>Hollësi</translation>
</message>
<message>
<location filename="../src/ui/qml/OfflineStateItem.qml" line="143"/>
<source>Connection failed</source>
- <translation>Anslutning misslyckades</translation>
+ <translation>Lidhja dështoi</translation>
</message>
<message>
<location filename="../src/ui/qml/OfflineStateItem.qml" line="169"/>
<source>Connecting…</source>
<extracomment>\u2026 is ellipsis</extracomment>
- <translation>Ansluter...</translation>
+ <translation>Po lidhet…</translation>
</message>
</context>
<context>
@@ -400,27 +408,27 @@
<message>
<location filename="../src/ui/qml/OpenBrowserDialog.qml" line="40"/>
<source><b>Warning!</b> Opening links with your default browser will harm your security and anonymity.<br><br>You can <a href='.'>copy to the clipboard</a> instead.</source>
- <translation><b>Varning!</b> Att öppna länkar med din standard­webbläsare skadar din säkerhet och anonymitet.<br><br>Du kan <a href='.'>kopiera till Urklipp</a> istället.</translation>
+ <translation><b>Kujdes!</b> Hapja e lidhjeve me shfletuesin tuaj parazgjedhje do të rrezikojë sigurinë dhe anonimitetin tuaj.<br><br>Më mirë mund <a href='.'>ta kopjoni në të papastër</a>.</translation>
</message>
<message>
<location filename="../src/ui/qml/OpenBrowserDialog.qml" line="59"/>
<source>Don't ask again for links from %1</source>
- <translation>Fråga inte igen för länkar från %1</translation>
+ <translation>Mos pyet sërish për lidhje nga %1</translation>
</message>
<message>
<location filename="../src/ui/qml/OpenBrowserDialog.qml" line="65"/>
<source>Don't ask again for any links (not recommended!)</source>
- <translation>Fråga inte igen för några länkar (rekommenderas inte!)</translation>
+ <translation>Mos pyet më, për çfarëdo lidhje (e pakëshillueshme!)</translation>
</message>
<message>
<location filename="../src/ui/qml/OpenBrowserDialog.qml" line="72"/>
<source>Open Browser</source>
- <translation>Öppna webbläsaren</translation>
+ <translation>Hap Shfletues</translation>
</message>
<message>
<location filename="../src/ui/qml/OpenBrowserDialog.qml" line="84"/>
<source>Cancel</source>
- <translation>Avbryt</translation>
+ <translation>Anulojeni</translation>
</message>
</context>
<context>
@@ -428,32 +436,31 @@
<message>
<location filename="../src/ui/qml/PreferencesDialog.qml" line="12"/>
<source>Ricochet Preferences</source>
- <translation>Inställningar för Ricochet</translation>
+ <translation>Parapëlqime për Ricochet-in</translation>
</message>
<message>
<location filename="../src/ui/qml/PreferencesDialog.qml" line="41"/>
<source>General</source>
- <translation>Allmänt</translation>
+ <translation>Të përgjithshme</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="46"/>
<source>Language</source>
- <translation>Språk</translation>
+ <translation type="vanished">Gjuhë</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="51"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="46"/>
<source>Contacts</source>
- <translation>Kontakter</translation>
+ <translation>Kontakte</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="56"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="51"/>
<source>Tor</source>
<translation>Tor</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="61"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="56"/>
<source>About</source>
- <translation>Om</translation>
+ <translation>Mbi</translation>
</message>
</context>
<context>
@@ -461,7 +468,7 @@
<message>
<location filename="../src/ui/qml/MainWindow.qml" line="29"/>
<source>Preference</source>
- <translation>Inställning</translation>
+ <translation>Parapëlqim</translation>
</message>
</context>
<context>
@@ -469,12 +476,12 @@
<message>
<location filename="../src/ui/qml/StartupStatusPage.qml" line="18"/>
<source>The Tor process was not started successfully. This is most likely an installation or system error.</source>
- <translation>Tor-processen startade inte korrekt. Det beror förmodligen på ett installations- eller systemfel.</translation>
+ <translation>Procesi Tor s’u nis me sukses. Ka shumë të ngjarë që ky të jetë një gabim instalimi ose sistemi.</translation>
</message>
<message>
<location filename="../src/ui/qml/StartupStatusPage.qml" line="49"/>
<source>Quit</source>
- <translation>Avsluta</translation>
+ <translation>Dilni</translation>
</message>
</context>
<context>
@@ -483,112 +490,112 @@
<location filename="../src/ui/qml/TorBootstrapStatus.qml" line="17"/>
<source>Connecting to the Tor network…</source>
<extracomment>\u2026 is ellipsis</extracomment>
- <translation>Ansluter till Tor-nätverket...</translation>
+ <translation>Po lidhet me rrjetin TOR…</translation>
</message>
<message>
<location filename="../src/ui/qml/TorBootstrapStatus.qml" line="51"/>
<source>Back</source>
- <translation>Tillbaka</translation>
+ <translation>Mbrapsht</translation>
</message>
<message>
<location filename="../src/ui/qml/TorBootstrapStatus.qml" line="58"/>
<source>Hide details</source>
- <translation>Göm detaljer</translation>
+ <translation>Fshihi hollësitë</translation>
</message>
<message>
<location filename="../src/ui/qml/TorBootstrapStatus.qml" line="58"/>
<source>Show details</source>
- <translation>Visa detaljer</translation>
+ <translation>Shfaqi hollësitë</translation>
</message>
<message>
<location filename="../src/ui/qml/TorBootstrapStatus.qml" line="70"/>
<source>Done</source>
- <translation>Klar</translation>
+ <translation>U bë</translation>
</message>
</context>
<context>
<name>TorConfigurationPage</name>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="72"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="73"/>
<source>Does this computer need a proxy to access the internet?</source>
- <translation>Behöver den här datorn använda en proxy för att ansluta till Internet?</translation>
+ <translation>Ka nevojë për ndërmjetës ky kompjuter, që të lidhet në internet?</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="84"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="85"/>
<source>Proxy type:</source>
- <translation>Typ av proxy:</translation>
+ <translation>Lloj ndërmjetësi:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="89"/>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="91"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="90"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="92"/>
<source>None</source>
- <translation>Ingen</translation>
+ <translation>Asnjë</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="106"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="107"/>
<source>Address:</source>
- <translation>Adress:</translation>
+ <translation>Adresë:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="115"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="116"/>
<source>IP address or hostname</source>
- <translation>IP-adress eller värdnamn</translation>
+ <translation>Adresë IP ose emër strehe</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="118"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="119"/>
<source>Port:</source>
- <translation>Port:</translation>
+ <translation>Portë:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="129"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="130"/>
<source>Username:</source>
- <translation>Användarnamn:</translation>
+ <translation>Emër përdoruesi:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="139"/>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="149"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="140"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="150"/>
<source>Optional</source>
- <translation>Krävs ej</translation>
+ <translation>Opsionale</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="142"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="143"/>
<source>Password:</source>
- <translation>Lösenord:</translation>
+ <translation>Fjalëkalim:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="159"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="160"/>
<source>Does this computer's Internet connection go through a firewall that only allows connections to certain ports?</source>
- <translation>Går den här datorns Internetanslutning genom en brandvägg som bara tillåter anslutningar på vissa portar?</translation>
+ <translation>A kalon përmes një firewall-i lidhja internet e këtij kompjuteri, i cili lejon lidhje vetëm te disa prej portave?</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="170"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="171"/>
<source>Allowed ports:</source>
- <translation>Tillåtna portar:</translation>
+ <translation>Porta të lejuara:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="177"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="178"/>
<source>Example: 80,443</source>
- <translation>Exempel: 80,443</translation>
+ <translation>Shembull: 80,443</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="188"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="189"/>
<source>If this computer's Internet connection is censored, you will need to obtain and use bridge relays.</source>
- <translation>Om den här datorns Internetanslutning är censurerad måste du skaffa och använda en brygga till Tor, en så kallad ”bridge relay”.</translation>
+ <translation>Nëse lidhja në Internet e këtij kompjuteri është e censuruar, do t’ju duhet të merrni dhe përdorni <i>bridge relays</i>.</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="197"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="198"/>
<source>Enter one or more bridge relays (one per line):</source>
- <translation>Ange en eller flera bryggor (en per rad):</translation>
+ <translation>Jepni një ose më tepër <i>bridge relays</i> (një për rresht):</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="212"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="213"/>
<source>Back</source>
- <translation>Tillbaka</translation>
+ <translation>Mbrapsht</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="219"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="220"/>
<source>Connect</source>
- <translation>Anslut</translation>
+ <translation>Lidhu</translation>
</message>
</context>
<context>
@@ -596,51 +603,51 @@
<message>
<location filename="../src/ui/qml/TorPreferences.qml" line="25"/>
<source>Running:</source>
- <translation>Körs:</translation>
+ <translation>Xhiron:</translation>
</message>
<message>
<location filename="../src/ui/qml/TorPreferences.qml" line="26"/>
<location filename="../src/ui/qml/TorPreferences.qml" line="28"/>
<location filename="../src/ui/qml/TorPreferences.qml" line="30"/>
<source>Yes</source>
- <translation>Ja</translation>
+ <translation>Po</translation>
</message>
<message>
<location filename="../src/ui/qml/TorPreferences.qml" line="26"/>
<location filename="../src/ui/qml/TorPreferences.qml" line="28"/>
<location filename="../src/ui/qml/TorPreferences.qml" line="30"/>
<source>No</source>
- <translation>Nej</translation>
+ <translation>Jo</translation>
</message>
<message>
<location filename="../src/ui/qml/TorPreferences.qml" line="26"/>
<source>External</source>
- <translation>Extern</translation>
+ <translation>I jashtëm</translation>
</message>
<message>
<location filename="../src/ui/qml/TorPreferences.qml" line="27"/>
<source>Control connected:</source>
- <translation>Kontroll ansluten:</translation>
+ <translation>I lidhur me kontrollin:</translation>
</message>
<message>
<location filename="../src/ui/qml/TorPreferences.qml" line="29"/>
<source>Circuits established:</source>
- <translation>Kretsar etablerade:</translation>
+ <translation>Qarqe të vendosur:</translation>
</message>
<message>
<location filename="../src/ui/qml/TorPreferences.qml" line="31"/>
<source>Hidden service:</source>
- <translation>Dold tjänst:</translation>
+ <translation>Shërbim i fshehur:</translation>
</message>
<message>
<location filename="../src/ui/qml/TorPreferences.qml" line="32"/>
<source>Online</source>
- <translation>Online</translation>
+ <translation>Në linjë</translation>
</message>
<message>
<location filename="../src/ui/qml/TorPreferences.qml" line="32"/>
<source>Offline</source>
- <translation>Offline</translation>
+ <translation>Jo në linjë</translation>
</message>
<message>
<location filename="../src/ui/qml/TorPreferences.qml" line="33"/>
@@ -651,12 +658,12 @@
<location filename="../src/ui/qml/TorPreferences.qml" line="60"/>
<source>Error: <b>%1</b></source>
<extracomment>%1 is error message</extracomment>
- <translation>Fel: <b>%1</b></translation>
+ <translation>Gabim: <b>%1</b></translation>
</message>
<message>
<location filename="../src/ui/qml/TorPreferences.qml" line="76"/>
<source>Configure</source>
- <translation>Konfigurera</translation>
+ <translation>Formësojeni</translation>
</message>
</context>
<context>
@@ -665,30 +672,30 @@
<location filename="../src/ui/qml/TorStateWidget.qml" line="9"/>
<location filename="../src/ui/qml/TorStateWidget.qml" line="20"/>
<source>Connection failed</source>
- <translation>Anslutning misslyckades</translation>
+ <translation>Lidhja dështoi</translation>
</message>
<message>
<location filename="../src/ui/qml/TorStateWidget.qml" line="12"/>
<location filename="../src/ui/qml/TorStateWidget.qml" line="22"/>
<source>Connecting…</source>
<extracomment>\u2026 is ellipsis</extracomment>
- <translation>Ansluter...</translation>
+ <translation>Po lidhet…</translation>
</message>
<message>
<location filename="../src/ui/qml/TorStateWidget.qml" line="25"/>
<source>Connecting… (%1%)</source>
<extracomment>%1 is progress percentage, e.g. 100</extracomment>
- <translation>Ansluter… (%1%)</translation>
+ <translation>Po lidhet… (%1%)</translation>
</message>
<message>
<location filename="../src/ui/qml/TorStateWidget.qml" line="32"/>
<source>Online</source>
- <translation>Online</translation>
+ <translation>Në linjë</translation>
</message>
<message>
<location filename="../src/ui/qml/TorStateWidget.qml" line="34"/>
<source>Connected</source>
- <translation>Ansluten</translation>
+ <translation>I lidhur</translation>
</message>
</context>
</TS>
diff --git a/translation/ricochet_sv.ts b/translation/ricochet_sv.ts
index 72c5514..abbd656 100644
--- a/translation/ricochet_sv.ts
+++ b/translation/ricochet_sv.ts
@@ -54,27 +54,27 @@
<context>
<name>ContactIDField</name>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="40"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="41"/>
<source><b>%1</b> is already your contact</source>
<translation><b>%1</b> finns redan bland dina kontakter</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="42"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="43"/>
<source>You can't add yourself as a contact</source>
<translation>Du kan inte lägga till dig själv som kontakt</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="44"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="45"/>
<source>Enter an ID starting with <b>ricochet:</b></source>
<translation>Fyll i ett ID som startar med <b>ricochet:</b></translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="80"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="81"/>
<source>Copied to clipboard</source>
<translation>Kopierat till Urklipp</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="92"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="93"/>
<source>Copy</source>
<translation>Kopiera</translation>
</message>
@@ -210,37 +210,45 @@
<context>
<name>GeneralPreferences</name>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="12"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="13"/>
<source>Use a single window for conversations</source>
<translation>Använd bara ett fönster för konversationer</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="20"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="21"/>
<source>Open links in default browser without prompting</source>
<translation>Öppna länkar i standardwebbläsaren utan att fråga</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="28"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="29"/>
<source>Play audio notifications</source>
<translation>Spela ljudnotiser</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="37"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="38"/>
<source>Volume</source>
<translation>Volym</translation>
</message>
+ <message>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="53"/>
+ <source>Language</source>
+ <translation type="unfinished">Språk</translation>
+ </message>
+ <message>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="76"/>
+ <source>Restart Ricochet to apply changes</source>
+ <translation type="unfinished">Starta om Ricochet för att aktivera ändringarna</translation>
+ </message>
</context>
<context>
<name>LanguagePreferences</name>
<message>
- <location filename="../src/ui/qml/LanguagePreferences.qml" line="22"/>
<source>Select Language</source>
- <translation>Välj språk</translation>
+ <translation type="vanished">Välj språk</translation>
</message>
<message>
- <location filename="../src/ui/qml/LanguagePreferences.qml" line="52"/>
<source>Restart Ricochet to apply changes</source>
- <translation>Starta om Ricochet för att aktivera ändringarna</translation>
+ <translation type="vanished">Starta om Ricochet för att aktivera ändringarna</translation>
</message>
</context>
<context>
@@ -254,7 +262,7 @@
<context>
<name>Main</name>
<message>
- <location filename="../src/main.cpp" line="73"/>
+ <location filename="../src/main.cpp" line="81"/>
<source>Ricochet Error</source>
<translation>Ricochet fel</translation>
</message>
@@ -436,22 +444,21 @@
<translation>Allmänt</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="46"/>
<source>Language</source>
- <translation>Språk</translation>
+ <translation type="vanished">Språk</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="51"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="46"/>
<source>Contacts</source>
<translation>Kontakter</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="56"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="51"/>
<source>Tor</source>
<translation>Tor</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="61"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="56"/>
<source>About</source>
<translation>Om</translation>
</message>
@@ -509,84 +516,84 @@
<context>
<name>TorConfigurationPage</name>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="72"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="73"/>
<source>Does this computer need a proxy to access the internet?</source>
<translation>Behöver den här datorn använda en proxy för att ansluta till Internet?</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="84"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="85"/>
<source>Proxy type:</source>
<translation>Typ av proxy:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="89"/>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="91"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="90"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="92"/>
<source>None</source>
<translation>Ingen</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="106"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="107"/>
<source>Address:</source>
<translation>Adress:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="115"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="116"/>
<source>IP address or hostname</source>
<translation>IP-adress eller värdnamn</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="118"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="119"/>
<source>Port:</source>
<translation>Port:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="129"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="130"/>
<source>Username:</source>
<translation>Användarnamn:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="139"/>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="149"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="140"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="150"/>
<source>Optional</source>
<translation>Krävs ej</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="142"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="143"/>
<source>Password:</source>
<translation>Lösenord:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="159"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="160"/>
<source>Does this computer's Internet connection go through a firewall that only allows connections to certain ports?</source>
<translation>Går den här datorns Internetanslutning genom en brandvägg som bara tillåter anslutningar på vissa portar?</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="170"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="171"/>
<source>Allowed ports:</source>
<translation>Tillåtna portar:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="177"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="178"/>
<source>Example: 80,443</source>
<translation>Exempel: 80,443</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="188"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="189"/>
<source>If this computer's Internet connection is censored, you will need to obtain and use bridge relays.</source>
<translation>Om den här datorns Internetanslutning är censurerad måste du skaffa och använda en brygga till Tor, en så kallad ”bridge relay”.</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="197"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="198"/>
<source>Enter one or more bridge relays (one per line):</source>
<translation>Ange en eller flera bryggor (en per rad):</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="212"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="213"/>
<source>Back</source>
<translation>Tillbaka</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="219"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="220"/>
<source>Connect</source>
<translation>Anslut</translation>
</message>
diff --git a/translation/ricochet_tr.ts b/translation/ricochet_tr.ts
index 9b0e6e6..5ced85f 100644
--- a/translation/ricochet_tr.ts
+++ b/translation/ricochet_tr.ts
@@ -54,27 +54,27 @@
<context>
<name>ContactIDField</name>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="40"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="41"/>
<source><b>%1</b> is already your contact</source>
<translation><b>%1</b> kişi listenize zaten eklenmiş</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="42"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="43"/>
<source>You can't add yourself as a contact</source>
<translation>Kendinizi kişi listesine ekleyemezsiniz</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="44"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="45"/>
<source>Enter an ID starting with <b>ricochet:</b></source>
<translation><b>ricochet:</b> ile başlayan bir kimlik girin</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="80"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="81"/>
<source>Copied to clipboard</source>
<translation>Panoya kopyalandı</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="92"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="93"/>
<source>Copy</source>
<translation>Kopyala</translation>
</message>
@@ -210,37 +210,45 @@
<context>
<name>GeneralPreferences</name>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="12"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="13"/>
<source>Use a single window for conversations</source>
<translation>Görüşmeler için tek pencere kullan</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="20"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="21"/>
<source>Open links in default browser without prompting</source>
<translation>Bağlantıları bana sormadan varsayılan tarayıcıda aç</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="28"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="29"/>
<source>Play audio notifications</source>
<translation>Ses bildirimlerini oynat</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="37"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="38"/>
<source>Volume</source>
<translation>Ses</translation>
</message>
+ <message>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="53"/>
+ <source>Language</source>
+ <translation type="unfinished">Dil</translation>
+ </message>
+ <message>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="76"/>
+ <source>Restart Ricochet to apply changes</source>
+ <translation type="unfinished">Değişikliklerin uygulanması için Ricochet'i yeniden başlatın.</translation>
+ </message>
</context>
<context>
<name>LanguagePreferences</name>
<message>
- <location filename="../src/ui/qml/LanguagePreferences.qml" line="22"/>
<source>Select Language</source>
- <translation>Dil Seçin</translation>
+ <translation type="vanished">Dil Seçin</translation>
</message>
<message>
- <location filename="../src/ui/qml/LanguagePreferences.qml" line="52"/>
<source>Restart Ricochet to apply changes</source>
- <translation>Değişikliklerin uygulanması için Ricochet'i yeniden başlatın.</translation>
+ <translation type="vanished">Değişikliklerin uygulanması için Ricochet'i yeniden başlatın.</translation>
</message>
</context>
<context>
@@ -254,7 +262,7 @@
<context>
<name>Main</name>
<message>
- <location filename="../src/main.cpp" line="73"/>
+ <location filename="../src/main.cpp" line="81"/>
<source>Ricochet Error</source>
<translation>Ricochet Hatası</translation>
</message>
@@ -436,22 +444,21 @@
<translation>Genel</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="46"/>
<source>Language</source>
- <translation>Dil</translation>
+ <translation type="vanished">Dil</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="51"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="46"/>
<source>Contacts</source>
<translation>Kişiler</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="56"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="51"/>
<source>Tor</source>
<translation>Tor</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="61"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="56"/>
<source>About</source>
<translation>Hakkında</translation>
</message>
@@ -509,84 +516,84 @@
<context>
<name>TorConfigurationPage</name>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="72"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="73"/>
<source>Does this computer need a proxy to access the internet?</source>
<translation>Bu bilgisayar internete erişmek için bir proxy'e ihtiyaç duyuyor mu?</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="84"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="85"/>
<source>Proxy type:</source>
<translation>Proxy türü:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="89"/>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="91"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="90"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="92"/>
<source>None</source>
<translation>Hiçbiri</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="106"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="107"/>
<source>Address:</source>
<translation>Adres:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="115"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="116"/>
<source>IP address or hostname</source>
<translation>IP adresi veya host adı</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="118"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="119"/>
<source>Port:</source>
<translation>Port:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="129"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="130"/>
<source>Username:</source>
<translation>Kullanıcı adı:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="139"/>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="149"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="140"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="150"/>
<source>Optional</source>
<translation>İsteğe bağlı</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="142"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="143"/>
<source>Password:</source>
<translation>Parola:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="159"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="160"/>
<source>Does this computer's Internet connection go through a firewall that only allows connections to certain ports?</source>
<translation>Bu bilgisayarın internet bağlantısı sadece belli portlara bağlantı izni veren bir güvenlik duvarı üzerinden gidiyor mu?</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="170"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="171"/>
<source>Allowed ports:</source>
<translation>İzin verilen portlar:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="177"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="178"/>
<source>Example: 80,443</source>
<translation>Örnek: 80.443</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="188"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="189"/>
<source>If this computer's Internet connection is censored, you will need to obtain and use bridge relays.</source>
<translation>Bu bilgisayarın internet bağlantısı sansürlenmişse, köprü aktarımlarını edinmeniz ve kullanmanız gerekir.</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="197"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="198"/>
<source>Enter one or more bridge relays (one per line):</source>
<translation>Bir veya birden fazla köprü aktarım adresi girin (satır başına bir tane):</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="212"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="213"/>
<source>Back</source>
<translation>Geri</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="219"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="220"/>
<source>Connect</source>
<translation>Bağlan</translation>
</message>
@@ -620,7 +627,7 @@
<message>
<location filename="../src/ui/qml/TorPreferences.qml" line="27"/>
<source>Control connected:</source>
- <translation type="unfinished"></translation>
+ <translation>Kontrol bağlantısı:</translation>
</message>
<message>
<location filename="../src/ui/qml/TorPreferences.qml" line="29"/>
diff --git a/translation/ricochet_uk.ts b/translation/ricochet_uk.ts
index 0ae9a17..8228728 100644
--- a/translation/ricochet_uk.ts
+++ b/translation/ricochet_uk.ts
@@ -54,27 +54,27 @@
<context>
<name>ContactIDField</name>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="40"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="41"/>
<source><b>%1</b> is already your contact</source>
<translation><b>%1</b> це вже ваш контакт</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="42"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="43"/>
<source>You can't add yourself as a contact</source>
<translation>Ви не можете додати самі себе як контакт</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="44"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="45"/>
<source>Enter an ID starting with <b>ricochet:</b></source>
<translation>Введіть ID який починається з <b>ricochet:</b></translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="80"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="81"/>
<source>Copied to clipboard</source>
<translation>Скопійовано до буферу обміну</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="92"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="93"/>
<source>Copy</source>
<translation>Копіювати</translation>
</message>
@@ -210,37 +210,45 @@
<context>
<name>GeneralPreferences</name>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="12"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="13"/>
<source>Use a single window for conversations</source>
<translation>Використовувати одне вікно для розмов</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="20"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="21"/>
<source>Open links in default browser without prompting</source>
<translation>Відкривати посилання в браузері без запитань</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="28"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="29"/>
<source>Play audio notifications</source>
<translation>Програти аудіо повідомлення</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="37"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="38"/>
<source>Volume</source>
<translation>Гучність</translation>
</message>
+ <message>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="53"/>
+ <source>Language</source>
+ <translation type="unfinished">Мова</translation>
+ </message>
+ <message>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="76"/>
+ <source>Restart Ricochet to apply changes</source>
+ <translation type="unfinished">Перезавантажити Ricochet для збереження змін</translation>
+ </message>
</context>
<context>
<name>LanguagePreferences</name>
<message>
- <location filename="../src/ui/qml/LanguagePreferences.qml" line="22"/>
<source>Select Language</source>
- <translation>Вибір мови</translation>
+ <translation type="vanished">Вибір мови</translation>
</message>
<message>
- <location filename="../src/ui/qml/LanguagePreferences.qml" line="52"/>
<source>Restart Ricochet to apply changes</source>
- <translation>Перезавантажити Ricochet для збереження змін</translation>
+ <translation type="vanished">Перезавантажити Ricochet для збереження змін</translation>
</message>
</context>
<context>
@@ -254,7 +262,7 @@
<context>
<name>Main</name>
<message>
- <location filename="../src/main.cpp" line="73"/>
+ <location filename="../src/main.cpp" line="81"/>
<source>Ricochet Error</source>
<translation>Помилка Ricochet</translation>
</message>
@@ -436,22 +444,21 @@
<translation>Основні</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="46"/>
<source>Language</source>
- <translation>Мова</translation>
+ <translation type="vanished">Мова</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="51"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="46"/>
<source>Contacts</source>
<translation>Контакти</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="56"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="51"/>
<source>Tor</source>
<translation>Tor</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="61"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="56"/>
<source>About</source>
<translation>Про </translation>
</message>
@@ -509,84 +516,84 @@
<context>
<name>TorConfigurationPage</name>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="72"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="73"/>
<source>Does this computer need a proxy to access the internet?</source>
<translation>Чи потребує цей комп'ютер проксі для доступу до інтернету?</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="84"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="85"/>
<source>Proxy type:</source>
<translation>Тип проксі:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="89"/>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="91"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="90"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="92"/>
<source>None</source>
<translation>Ніякого</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="106"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="107"/>
<source>Address:</source>
<translation>Адреса:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="115"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="116"/>
<source>IP address or hostname</source>
<translation>IP адреса чи ім'я сервера</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="118"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="119"/>
<source>Port:</source>
<translation>Порт:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="129"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="130"/>
<source>Username:</source>
<translation>Ім'я:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="139"/>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="149"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="140"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="150"/>
<source>Optional</source>
<translation>Опції</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="142"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="143"/>
<source>Password:</source>
<translation>Пароль:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="159"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="160"/>
<source>Does this computer's Internet connection go through a firewall that only allows connections to certain ports?</source>
<translation>З'єднання цього комп'ютеру проходять через firewall який дозволяй з'єднання тільки з певними портами? </translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="170"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="171"/>
<source>Allowed ports:</source>
<translation>Дозволені порти:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="177"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="178"/>
<source>Example: 80,443</source>
<translation>Наприклад: 80,443</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="188"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="189"/>
<source>If this computer's Internet connection is censored, you will need to obtain and use bridge relays.</source>
<translation>Якщо інтернет з'єднання цього комп'ютеру цензуруються, то вам потрібно отримати і використовувати ретранслятори. </translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="197"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="198"/>
<source>Enter one or more bridge relays (one per line):</source>
<translation>Введіть один або декілька адрес ретрансляторів (один на лінію)</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="212"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="213"/>
<source>Back</source>
<translation>Назад</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="219"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="220"/>
<source>Connect</source>
<translation>Підключення</translation>
</message>
diff --git a/translation/ricochet_zh.ts b/translation/ricochet_zh.ts
index d77735d..b7da4d1 100644
--- a/translation/ricochet_zh.ts
+++ b/translation/ricochet_zh.ts
@@ -1,4 +1,6 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="zh" version="2.1">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="zh">
<context>
<name>AboutPreferences</name>
<message>
@@ -52,27 +54,27 @@
<context>
<name>ContactIDField</name>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="40"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="41"/>
<source><b>%1</b> is already your contact</source>
<translation><b>%1</b>已经是你的联系人</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="42"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="43"/>
<source>You can't add yourself as a contact</source>
<translation>不能添加自己为联系人</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="44"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="45"/>
<source>Enter an ID starting with <b>ricochet:</b></source>
<translation>输入一个ID并以<b>ricochet:</b>打头</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="79"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="81"/>
<source>Copied to clipboard</source>
<translation>复制到剪贴板</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="91"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="93"/>
<source>Copy</source>
<translation>复制</translation>
</message>
@@ -80,91 +82,91 @@
<context>
<name>ContactList</name>
<message>
- <location filename="../src/ui/qml/ContactList.qml" line="75"/>
+ <location filename="../src/ui/qml/ContactList.qml" line="76"/>
<source>Online</source>
<translation>在线</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactList.qml" line="76"/>
+ <location filename="../src/ui/qml/ContactList.qml" line="77"/>
<source>Offline</source>
<translation>离线</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactList.qml" line="77"/>
+ <location filename="../src/ui/qml/ContactList.qml" line="78"/>
<source>Requests</source>
<translation>请求</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactList.qml" line="78"/>
+ <location filename="../src/ui/qml/ContactList.qml" line="79"/>
<source>Rejected</source>
<translation>已拒绝</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactList.qml" line="79"/>
+ <location filename="../src/ui/qml/ContactList.qml" line="80"/>
<source>Outdated</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ContactPreferences</name>
<message>
- <location filename="../src/ui/qml/ContactPreferences.qml" line="97"/>
+ <location filename="../src/ui/qml/ContactPreferences.qml" line="98"/>
<source>Date added:</source>
<translation>添加日期：</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactPreferences.qml" line="104"/>
+ <location filename="../src/ui/qml/ContactPreferences.qml" line="106"/>
<source>Last seen:</source>
<translation>最后上线：</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactPreferences.qml" line="113"/>
+ <location filename="../src/ui/qml/ContactPreferences.qml" line="116"/>
<source>Request:</source>
<translation>请求：</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactPreferences.qml" line="122"/>
+ <location filename="../src/ui/qml/ContactPreferences.qml" line="126"/>
<source>Pending connection</source>
<translation>挂起的连接</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactPreferences.qml" line="123"/>
+ <location filename="../src/ui/qml/ContactPreferences.qml" line="127"/>
<source>Delivered</source>
<translation>送达</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactPreferences.qml" line="124"/>
+ <location filename="../src/ui/qml/ContactPreferences.qml" line="128"/>
<source>Accepted</source>
<translation>已接受</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactPreferences.qml" line="125"/>
+ <location filename="../src/ui/qml/ContactPreferences.qml" line="129"/>
<source>Error</source>
<translation>错误</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactPreferences.qml" line="126"/>
+ <location filename="../src/ui/qml/ContactPreferences.qml" line="130"/>
<source>Rejected</source>
<translation>已拒绝</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactPreferences.qml" line="130"/>
+ <location filename="../src/ui/qml/ContactPreferences.qml" line="134"/>
<source>%1 (Connected)</source>
<extracomment>%1 status, e.g. "Accepted"</extracomment>
<translation>%1 (已连接)</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactPreferences.qml" line="136"/>
+ <location filename="../src/ui/qml/ContactPreferences.qml" line="140"/>
<source>Response:</source>
<translation>回复：</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactPreferences.qml" line="158"/>
+ <location filename="../src/ui/qml/ContactPreferences.qml" line="163"/>
<source>Rename</source>
<translation>重命名</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactPreferences.qml" line="165"/>
+ <location filename="../src/ui/qml/ContactPreferences.qml" line="170"/>
<source>Remove</source>
<translation>移除</translation>
</message>
@@ -208,37 +210,45 @@
<context>
<name>GeneralPreferences</name>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="12"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="13"/>
<source>Use a single window for conversations</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="20"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="21"/>
<source>Open links in default browser without prompting</source>
<translation>无需提示，直接在默认浏览器中打开链接</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="28"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="29"/>
<source>Play audio notifications</source>
<translation>使用声音提醒</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="37"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="38"/>
<source>Volume</source>
<translation>音量</translation>
</message>
+ <message>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="53"/>
+ <source>Language</source>
+ <translation type="unfinished">语言</translation>
+ </message>
+ <message>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="76"/>
+ <source>Restart Ricochet to apply changes</source>
+ <translation type="unfinished">应用并重启</translation>
+ </message>
</context>
<context>
<name>LanguagePreferences</name>
<message>
- <location filename="../src/ui/qml/LanguagePreferences.qml" line="22"/>
<source>Select Language</source>
- <translation>选择语言</translation>
+ <translation type="vanished">选择语言</translation>
</message>
<message>
- <location filename="../src/ui/qml/LanguagePreferences.qml" line="52"/>
<source>Restart Ricochet to apply changes</source>
- <translation>应用并重启</translation>
+ <translation type="vanished">应用并重启</translation>
</message>
</context>
<context>
@@ -252,7 +262,7 @@
<context>
<name>Main</name>
<message>
- <location filename="../src/main.cpp" line="73"/>
+ <location filename="../src/main.cpp" line="81"/>
<source>Ricochet Error</source>
<translation>Ricochet错误</translation>
</message>
@@ -278,12 +288,12 @@
<context>
<name>MainWindow</name>
<message>
- <location filename="../src/ui/MainWindow.cpp" line="153"/>
+ <location filename="../src/ui/MainWindow.cpp" line="191"/>
<source>Remove %1</source>
<translation>移除%1</translation>
</message>
<message>
- <location filename="../src/ui/MainWindow.cpp" line="154"/>
+ <location filename="../src/ui/MainWindow.cpp" line="192"/>
<source>Do you want to permanently remove %1?</source>
<translation>确定永久移除%1？</translation>
</message>
@@ -297,32 +307,32 @@
<translation>%1离线中</translation>
</message>
<message>
- <location filename="../src/ui/qml/MessageDelegate.qml" line="134"/>
+ <location filename="../src/ui/qml/MessageDelegate.qml" line="135"/>
<source>Copy ID</source>
<translation>复制帐号</translation>
</message>
<message>
- <location filename="../src/ui/qml/MessageDelegate.qml" line="134"/>
+ <location filename="../src/ui/qml/MessageDelegate.qml" line="135"/>
<source>Copy Link</source>
<translation>复制链接</translation>
</message>
<message>
- <location filename="../src/ui/qml/MessageDelegate.qml" line="139"/>
+ <location filename="../src/ui/qml/MessageDelegate.qml" line="140"/>
<source>Open with Browser</source>
<translation>用浏览器打开</translation>
</message>
<message>
- <location filename="../src/ui/qml/MessageDelegate.qml" line="153"/>
+ <location filename="../src/ui/qml/MessageDelegate.qml" line="154"/>
<source>Add as Contact</source>
<translation>添加为联系人</translation>
</message>
<message>
- <location filename="../src/ui/qml/MessageDelegate.qml" line="165"/>
+ <location filename="../src/ui/qml/MessageDelegate.qml" line="166"/>
<source>Copy Message</source>
<translation>复制消息</translation>
</message>
<message>
- <location filename="../src/ui/qml/MessageDelegate.qml" line="172"/>
+ <location filename="../src/ui/qml/MessageDelegate.qml" line="173"/>
<source>Copy Selection</source>
<translation>复制选择内容</translation>
</message>
@@ -330,20 +340,20 @@
<context>
<name>MessageDialogWrapper</name>
<message>
- <location filename="../src/ui/qml/MessageDialogWrapper.qml" line="7"/>
+ <location filename="../src/ui/qml/MessageDialogWrapper.qml" line="8"/>
<source>Remove %1</source>
<translation>移除%1</translation>
</message>
<message>
- <location filename="../src/ui/qml/MessageDialogWrapper.qml" line="9"/>
+ <location filename="../src/ui/qml/MessageDialogWrapper.qml" line="10"/>
<source>Do you want to permanently remove %1?</source>
<extracomment>%1 nickname</extracomment>
<translation>确定永久移除%1？</translation>
</message>
<message>
- <location filename="../src/ui/qml/MessageDialogWrapper.qml" line="10"/>
+ <location filename="../src/ui/qml/MessageDialogWrapper.qml" line="11"/>
<source>This contact will no longer be able to message you, and will be notified about the removal. They may choose to send a new connection request.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -396,27 +406,27 @@
<context>
<name>OpenBrowserDialog</name>
<message>
- <location filename="../src/ui/qml/OpenBrowserDialog.qml" line="39"/>
+ <location filename="../src/ui/qml/OpenBrowserDialog.qml" line="40"/>
<source><b>Warning!</b> Opening links with your default browser will harm your security and anonymity.<br><br>You can <a href='.'>copy to the clipboard</a> instead.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/ui/qml/OpenBrowserDialog.qml" line="58"/>
+ <location filename="../src/ui/qml/OpenBrowserDialog.qml" line="59"/>
<source>Don't ask again for links from %1</source>
<translation>不再询问来自%1的链接</translation>
</message>
<message>
- <location filename="../src/ui/qml/OpenBrowserDialog.qml" line="64"/>
+ <location filename="../src/ui/qml/OpenBrowserDialog.qml" line="65"/>
<source>Don't ask again for any links (not recommended!)</source>
<translation>不再询问任何链接(不推荐)</translation>
</message>
<message>
- <location filename="../src/ui/qml/OpenBrowserDialog.qml" line="71"/>
+ <location filename="../src/ui/qml/OpenBrowserDialog.qml" line="72"/>
<source>Open Browser</source>
<translation>打开浏览器</translation>
</message>
<message>
- <location filename="../src/ui/qml/OpenBrowserDialog.qml" line="83"/>
+ <location filename="../src/ui/qml/OpenBrowserDialog.qml" line="84"/>
<source>Cancel</source>
<translation>取消</translation>
</message>
@@ -434,22 +444,21 @@
<translation>通用</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="46"/>
<source>Language</source>
- <translation>语言</translation>
+ <translation type="vanished">语言</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="51"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="46"/>
<source>Contacts</source>
<translation>联系人</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="56"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="51"/>
<source>Tor</source>
<translation>Tor</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="61"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="56"/>
<source>About</source>
<translation>关于</translation>
</message>
@@ -484,22 +493,22 @@
<translation>连接到Tor网络中……</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorBootstrapStatus.qml" line="50"/>
+ <location filename="../src/ui/qml/TorBootstrapStatus.qml" line="51"/>
<source>Back</source>
<translation>返回</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorBootstrapStatus.qml" line="57"/>
+ <location filename="../src/ui/qml/TorBootstrapStatus.qml" line="58"/>
<source>Hide details</source>
<translation>隐藏细节</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorBootstrapStatus.qml" line="57"/>
+ <location filename="../src/ui/qml/TorBootstrapStatus.qml" line="58"/>
<source>Show details</source>
<translation>显示细节</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorBootstrapStatus.qml" line="69"/>
+ <location filename="../src/ui/qml/TorBootstrapStatus.qml" line="70"/>
<source>Done</source>
<translation>已完成</translation>
</message>
@@ -507,84 +516,84 @@
<context>
<name>TorConfigurationPage</name>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="72"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="73"/>
<source>Does this computer need a proxy to access the internet?</source>
<translation>这台电脑需要通过代理来连接网络吗？</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="84"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="85"/>
<source>Proxy type:</source>
<translation>代理类型：</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="89"/>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="91"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="90"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="92"/>
<source>None</source>
<translation>None</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="106"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="107"/>
<source>Address:</source>
<translation>地址：</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="115"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="116"/>
<source>IP address or hostname</source>
<translation>IP地址或主机名</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="118"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="119"/>
<source>Port:</source>
<translation>端口：</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="129"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="130"/>
<source>Username:</source>
<translation>用户名：</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="139"/>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="149"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="140"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="150"/>
<source>Optional</source>
<translation>可选</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="142"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="143"/>
<source>Password:</source>
<translation>密码：</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="159"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="160"/>
<source>Does this computer's Internet connection go through a firewall that only allows connections to certain ports?</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="170"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="171"/>
<source>Allowed ports:</source>
<translation>允许的端口：</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="177"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="178"/>
<source>Example: 80,443</source>
<translation>例如：80,443</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="188"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="189"/>
<source>If this computer's Internet connection is censored, you will need to obtain and use bridge relays.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="197"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="198"/>
<source>Enter one or more bridge relays (one per line):</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="212"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="213"/>
<source>Back</source>
<translation>返回</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="219"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="220"/>
<source>Connect</source>
<translation>连接</translation>
</message>
@@ -592,67 +601,67 @@
<context>
<name>TorPreferences</name>
<message>
- <location filename="../src/ui/qml/TorPreferences.qml" line="24"/>
+ <location filename="../src/ui/qml/TorPreferences.qml" line="25"/>
<source>Running:</source>
<translation>运行中</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorPreferences.qml" line="25"/>
- <location filename="../src/ui/qml/TorPreferences.qml" line="27"/>
- <location filename="../src/ui/qml/TorPreferences.qml" line="29"/>
+ <location filename="../src/ui/qml/TorPreferences.qml" line="26"/>
+ <location filename="../src/ui/qml/TorPreferences.qml" line="28"/>
+ <location filename="../src/ui/qml/TorPreferences.qml" line="30"/>
<source>Yes</source>
<translation>是</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorPreferences.qml" line="25"/>
- <location filename="../src/ui/qml/TorPreferences.qml" line="27"/>
- <location filename="../src/ui/qml/TorPreferences.qml" line="29"/>
+ <location filename="../src/ui/qml/TorPreferences.qml" line="26"/>
+ <location filename="../src/ui/qml/TorPreferences.qml" line="28"/>
+ <location filename="../src/ui/qml/TorPreferences.qml" line="30"/>
<source>No</source>
<translation>否</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorPreferences.qml" line="25"/>
+ <location filename="../src/ui/qml/TorPreferences.qml" line="26"/>
<source>External</source>
<translation>外部</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorPreferences.qml" line="26"/>
+ <location filename="../src/ui/qml/TorPreferences.qml" line="27"/>
<source>Control connected:</source>
<translation>联系人已连接：</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorPreferences.qml" line="28"/>
+ <location filename="../src/ui/qml/TorPreferences.qml" line="29"/>
<source>Circuits established:</source>
<translation>线路已经建立：</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorPreferences.qml" line="30"/>
+ <location filename="../src/ui/qml/TorPreferences.qml" line="31"/>
<source>Hidden service:</source>
<translation>隐藏的服务：</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorPreferences.qml" line="31"/>
+ <location filename="../src/ui/qml/TorPreferences.qml" line="32"/>
<source>Online</source>
<translation>在线</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorPreferences.qml" line="31"/>
+ <location filename="../src/ui/qml/TorPreferences.qml" line="32"/>
<source>Offline</source>
<translation>离线</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorPreferences.qml" line="32"/>
+ <location filename="../src/ui/qml/TorPreferences.qml" line="33"/>
<source>Version:</source>
<translation>版本：</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorPreferences.qml" line="59"/>
+ <location filename="../src/ui/qml/TorPreferences.qml" line="60"/>
<source>Error: <b>%1</b></source>
<extracomment>%1 is error message</extracomment>
<translation>错误: <b>%1</b></translation>
</message>
<message>
- <location filename="../src/ui/qml/TorPreferences.qml" line="75"/>
+ <location filename="../src/ui/qml/TorPreferences.qml" line="76"/>
<source>Configure</source>
<translation>配置</translation>
</message>
@@ -689,4 +698,4 @@
<translation>已连接</translation>
</message>
</context>
-</TS>
\ No newline at end of file
+</TS>
diff --git a/translation/ricochet_da.ts b/translation/ricochet_zh_HK.ts
similarity index 73%
copy from translation/ricochet_da.ts
copy to translation/ricochet_zh_HK.ts
index 03a1fed..e763451 100644
--- a/translation/ricochet_da.ts
+++ b/translation/ricochet_zh_HK.ts
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
-<TS version="2.1" language="da">
+<TS version="2.1" language="zh_HK">
<context>
<name>AboutPreferences</name>
<message>
@@ -15,17 +15,17 @@
<message>
<location filename="../src/ui/qml/AddContactDialog.qml" line="51"/>
<source>Share your Ricochet ID to allow connection requests</source>
- <translation>Del dit Ricochet ID for at tillade kontaktanmodninger</translation>
+ <translation>分享你的Ricochet ID 以允許連線的請求</translation>
</message>
<message>
<location filename="../src/ui/qml/AddContactDialog.qml" line="107"/>
<source>Cancel</source>
- <translation>Annuller</translation>
+ <translation>取消</translation>
</message>
<message>
<location filename="../src/ui/qml/AddContactDialog.qml" line="112"/>
<source>Add</source>
- <translation>Tilføj</translation>
+ <translation>新增</translation>
</message>
</context>
<context>
@@ -33,50 +33,50 @@
<message>
<location filename="../src/ui/qml/ContactActions.qml" line="40"/>
<source>Open Window</source>
- <translation>Åbn Vindue</translation>
+ <translation>開啟視窗</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactActions.qml" line="44"/>
<source>Details...</source>
- <translation>Detaljer...</translation>
+ <translation>細節</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactActions.qml" line="48"/>
<source>Rename</source>
- <translation>Omdøb</translation>
+ <translation>重新命名</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactActions.qml" line="53"/>
<source>Remove</source>
- <translation>Fjern</translation>
+ <translation>移除</translation>
</message>
</context>
<context>
<name>ContactIDField</name>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="40"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="41"/>
<source><b>%1</b> is already your contact</source>
- <translation><b>%1</b> er allerede på din kontaktliste</translation>
+ <translation><b>%1</b> 已是你的聯絡人</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="42"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="43"/>
<source>You can't add yourself as a contact</source>
- <translation>Du kan ikke tilføje dig selv som kontaktperson</translation>
+ <translation>你不能新增自己為聯絡人</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="44"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="45"/>
<source>Enter an ID starting with <b>ricochet:</b></source>
- <translation>Skriv et ID der begynder med <b>ricochet:</b></translation>
+ <translation>輸入ID開始使用 <b>ricochet:</b></translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="80"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="81"/>
<source>Copied to clipboard</source>
- <translation>Kopieret til clipboardet</translation>
+ <translation>複製到剪貼簿</translation>
</message>
<message>
- <location filename="../src/ui/qml/ContactIDField.qml" line="92"/>
+ <location filename="../src/ui/qml/ContactIDField.qml" line="93"/>
<source>Copy</source>
- <translation>Kopiér</translation>
+ <translation>複製</translation>
</message>
</context>
<context>
@@ -84,27 +84,27 @@
<message>
<location filename="../src/ui/qml/ContactList.qml" line="76"/>
<source>Online</source>
- <translation>Online</translation>
+ <translation>上線</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactList.qml" line="77"/>
<source>Offline</source>
- <translation>Offline</translation>
+ <translation>離線</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactList.qml" line="78"/>
<source>Requests</source>
- <translation>Anmodninger</translation>
+ <translation>請求</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactList.qml" line="79"/>
<source>Rejected</source>
- <translation>Afvist</translation>
+ <translation>拒絕</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactList.qml" line="80"/>
<source>Outdated</source>
- <translation>Forældet</translation>
+ <translation>過時</translation>
</message>
</context>
<context>
@@ -112,63 +112,63 @@
<message>
<location filename="../src/ui/qml/ContactPreferences.qml" line="98"/>
<source>Date added:</source>
- <translation>Dato tilføjet:</translation>
+ <translation>新增之日期:</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactPreferences.qml" line="106"/>
<source>Last seen:</source>
- <translation>Sidst set:</translation>
+ <translation>上回瀏覧:</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactPreferences.qml" line="116"/>
<source>Request:</source>
- <translation>Anmodning:</translation>
+ <translation>請求:</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactPreferences.qml" line="126"/>
<source>Pending connection</source>
- <translation>Afventer forbindelse</translation>
+ <translation>連線擱置中</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactPreferences.qml" line="127"/>
<source>Delivered</source>
- <translation>Afleveret</translation>
+ <translation>已傳送</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactPreferences.qml" line="128"/>
<source>Accepted</source>
- <translation>Accepteret</translation>
+ <translation>已接受</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactPreferences.qml" line="129"/>
<source>Error</source>
- <translation>Fejl</translation>
+ <translation>錯誤</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactPreferences.qml" line="130"/>
<source>Rejected</source>
- <translation>Afvist</translation>
+ <translation>拒絕</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactPreferences.qml" line="134"/>
<source>%1 (Connected)</source>
<extracomment>%1 status, e.g. "Accepted"</extracomment>
- <translation>%1 (Forbundet)</translation>
+ <translation>%1 (己連結)</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactPreferences.qml" line="140"/>
<source>Response:</source>
- <translation>Svar:</translation>
+ <translation>回應:</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactPreferences.qml" line="163"/>
<source>Rename</source>
- <translation>Omdøb</translation>
+ <translation>重新命名</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactPreferences.qml" line="170"/>
<source>Remove</source>
- <translation>Fjern</translation>
+ <translation>移除</translation>
</message>
</context>
<context>
@@ -176,17 +176,17 @@
<message>
<location filename="../src/ui/qml/ContactRequestDialog.qml" line="55"/>
<source>Someone new is asking to connect to you</source>
- <translation>Du har en ny kontaktanmodning</translation>
+ <translation>某新人要求與你連線</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactRequestDialog.qml" line="102"/>
<source>Reject</source>
- <translation>Afvis</translation>
+ <translation>拒絕</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactRequestDialog.qml" line="107"/>
<source>Accept</source>
- <translation>Acceptér</translation>
+ <translation>接受</translation>
</message>
</context>
<context>
@@ -199,48 +199,56 @@
<message>
<location filename="../src/ui/qml/ContactRequestFields.qml" line="29"/>
<source>Name:</source>
- <translation>Navn:</translation>
+ <translation>名稱:</translation>
</message>
<message>
<location filename="../src/ui/qml/ContactRequestFields.qml" line="40"/>
<source>Message:</source>
- <translation>Besked:</translation>
+ <translation>訊息:</translation>
</message>
</context>
<context>
<name>GeneralPreferences</name>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="12"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="13"/>
<source>Use a single window for conversations</source>
- <translation>Hold samtaler i ét vindue</translation>
+ <translation>使用單一視窗來對話</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="20"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="21"/>
<source>Open links in default browser without prompting</source>
- <translation>Åbn links i browser uden at spørge</translation>
+ <translation>在原瀏覧器中開啟連結而不要跳出新視窗</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="28"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="29"/>
<source>Play audio notifications</source>
- <translation>Afspil lydnotifikationer</translation>
+ <translation>開啟通知音訊</translation>
</message>
<message>
- <location filename="../src/ui/qml/GeneralPreferences.qml" line="37"/>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="38"/>
<source>Volume</source>
- <translation>Lydstyrke</translation>
+ <translation>音量</translation>
+ </message>
+ <message>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="53"/>
+ <source>Language</source>
+ <translation type="unfinished">語言</translation>
+ </message>
+ <message>
+ <location filename="../src/ui/qml/GeneralPreferences.qml" line="76"/>
+ <source>Restart Ricochet to apply changes</source>
+ <translation type="unfinished">重啟Ricochet 以更新改變</translation>
</message>
</context>
<context>
<name>LanguagePreferences</name>
<message>
- <location filename="../src/ui/qml/LanguagePreferences.qml" line="22"/>
<source>Select Language</source>
- <translation>Vælg sprog</translation>
+ <translation type="vanished">選取語言</translation>
</message>
<message>
- <location filename="../src/ui/qml/LanguagePreferences.qml" line="52"/>
<source>Restart Ricochet to apply changes</source>
- <translation>Genstart Ricochet for at anvende nye indstillinger</translation>
+ <translation type="vanished">重啟Ricochet 以更新改變</translation>
</message>
</context>
<context>
@@ -248,15 +256,15 @@
<message>
<location filename="../src/ui/LanguagesModel.cpp" line="43"/>
<source>System default</source>
- <translation>Standardindstillinger</translation>
+ <translation>系統預設</translation>
</message>
</context>
<context>
<name>Main</name>
<message>
- <location filename="../src/main.cpp" line="73"/>
+ <location filename="../src/main.cpp" line="81"/>
<source>Ricochet Error</source>
- <translation>Ricochet Fejl</translation>
+ <translation>Ricochet 出錯</translation>
</message>
</context>
<context>
@@ -264,17 +272,17 @@
<message>
<location filename="../src/ui/qml/MainToolBar.qml" line="19"/>
<source>Add Contact</source>
- <translation>Tilføj Kontaktperson</translation>
+ <translation>新增聯絡人</translation>
</message>
<message>
<location filename="../src/ui/qml/MainToolBar.qml" line="28"/>
<source>Preferences</source>
- <translation>Indstillinger</translation>
+ <translation>偏好</translation>
</message>
<message>
<location filename="../src/ui/qml/MainToolBar.qml" line="75"/>
<source>Click to add contacts</source>
- <translation>Klik for at tilføje kontaktpersoner</translation>
+ <translation>點擊來新增聯絡人</translation>
</message>
</context>
<context>
@@ -282,12 +290,12 @@
<message>
<location filename="../src/ui/MainWindow.cpp" line="191"/>
<source>Remove %1</source>
- <translation>Fjern %1</translation>
+ <translation>移除%1</translation>
</message>
<message>
<location filename="../src/ui/MainWindow.cpp" line="192"/>
<source>Do you want to permanently remove %1?</source>
- <translation>Vil du fjerne %1 permanent?</translation>
+ <translation>你是否要永遠移除%1?</translation>
</message>
</context>
<context>
@@ -296,37 +304,37 @@
<location filename="../src/ui/qml/MessageDelegate.qml" line="26"/>
<source>%1 is offline</source>
<extracomment>%1 nickname</extracomment>
- <translation>%1 er offline</translation>
+ <translation>%1 已離線</translation>
</message>
<message>
<location filename="../src/ui/qml/MessageDelegate.qml" line="135"/>
<source>Copy ID</source>
- <translation>Kopiér ID</translation>
+ <translation>複製ID</translation>
</message>
<message>
<location filename="../src/ui/qml/MessageDelegate.qml" line="135"/>
<source>Copy Link</source>
- <translation>Kopiér Link</translation>
+ <translation>複製連結</translation>
</message>
<message>
<location filename="../src/ui/qml/MessageDelegate.qml" line="140"/>
<source>Open with Browser</source>
- <translation>Åbn i browser</translation>
+ <translation>開啟瀏覧器</translation>
</message>
<message>
<location filename="../src/ui/qml/MessageDelegate.qml" line="154"/>
<source>Add as Contact</source>
- <translation>Tilføj som kontaktperson</translation>
+ <translation>新增聯絡人</translation>
</message>
<message>
<location filename="../src/ui/qml/MessageDelegate.qml" line="166"/>
<source>Copy Message</source>
- <translation>Kopiér besked</translation>
+ <translation>複製訊息</translation>
</message>
<message>
<location filename="../src/ui/qml/MessageDelegate.qml" line="173"/>
<source>Copy Selection</source>
- <translation>Kopiér markeret tekst</translation>
+ <translation>複製選項</translation>
</message>
</context>
<context>
@@ -334,18 +342,18 @@
<message>
<location filename="../src/ui/qml/MessageDialogWrapper.qml" line="8"/>
<source>Remove %1</source>
- <translation>Fjern %1</translation>
+ <translation>移除%1</translation>
</message>
<message>
<location filename="../src/ui/qml/MessageDialogWrapper.qml" line="10"/>
<source>Do you want to permanently remove %1?</source>
<extracomment>%1 nickname</extracomment>
- <translation>Vil du fjerne %1 permanent?</translation>
+ <translation>你是否要永遠移除%1?</translation>
</message>
<message>
<location filename="../src/ui/qml/MessageDialogWrapper.qml" line="11"/>
<source>This contact will no longer be able to message you, and will be notified about the removal. They may choose to send a new connection request.</source>
- <translation>Denne kontaktperson vil ikke længere være i stand til at sende dig beskeder, og vil blive notificeret om fjernelsen. Kontaktpersonen kan vælge at sende dig en ny kontaktanmodning.</translation>
+ <translation>這名聯絡人不再傳訊給你，也將接到遭移除的通知。他們可以選擇重新送出連結請求</translation>
</message>
</context>
<context>
@@ -353,22 +361,22 @@
<message>
<location filename="../src/ui/qml/NetworkSetupWizard.qml" line="100"/>
<source>This computer's Internet connection is free of obstacles. I would like to connect directly to the Tor network.</source>
- <translation>Denne computers internetadgang er uhindret. Jeg vil gerne forbinde direkte til Tor-netværket.</translation>
+ <translation>這台電腦的網路連結未有任何阻礙，可以直接連結上Tor網路</translation>
</message>
<message>
<location filename="../src/ui/qml/NetworkSetupWizard.qml" line="107"/>
<source>Connect</source>
- <translation>Forbind</translation>
+ <translation>連線</translation>
</message>
<message>
<location filename="../src/ui/qml/NetworkSetupWizard.qml" line="124"/>
<source>This computer's Internet connection is censored, filtered, or proxied. I need to configure network settings.</source>
- <translation>Denne computers internetadgang er censureret, filtreret eller bag en proxy. Jeg har brug for at konfigurere netværksindstillinger.</translation>
+ <translation>如果這台電腦的網路連線遭到監控，我必須修改網路設定</translation>
</message>
<message>
<location filename="../src/ui/qml/NetworkSetupWizard.qml" line="131"/>
<source>Configure</source>
- <translation>Konfigurér</translation>
+ <translation>設定</translation>
</message>
</context>
<context>
@@ -376,23 +384,23 @@
<message>
<location filename="../src/ui/qml/OfflineStateItem.qml" line="107"/>
<source>Configure</source>
- <translation>Konfigurér</translation>
+ <translation>設定</translation>
</message>
<message>
<location filename="../src/ui/qml/OfflineStateItem.qml" line="115"/>
<source>Details</source>
- <translation>Detaljer</translation>
+ <translation>細節</translation>
</message>
<message>
<location filename="../src/ui/qml/OfflineStateItem.qml" line="143"/>
<source>Connection failed</source>
- <translation>Forbindelsen mislykkedes</translation>
+ <translation>連線失敗</translation>
</message>
<message>
<location filename="../src/ui/qml/OfflineStateItem.qml" line="169"/>
<source>Connecting…</source>
<extracomment>\u2026 is ellipsis</extracomment>
- <translation>Forbinder…</translation>
+ <translation>連線中</translation>
</message>
</context>
<context>
@@ -400,27 +408,27 @@
<message>
<location filename="../src/ui/qml/OpenBrowserDialog.qml" line="40"/>
<source><b>Warning!</b> Opening links with your default browser will harm your security and anonymity.<br><br>You can <a href='.'>copy to the clipboard</a> instead.</source>
- <translation><b>Advarsel!</b> Ved at åbne links med din browser kan du forringe din sikkerhed og anonymitet.<br><br>Du kan <a href='.'>kopiere adressen til clipboardet</a> i stedet.</translation>
+ <translation><b>警告!</b> 用你的瀏覧器直接開啟連結可能會對安全與匿名性造成威脅.<br><br>你可另以<a href='.'>複製到剪貼簿</a>取代 .</translation>
</message>
<message>
<location filename="../src/ui/qml/OpenBrowserDialog.qml" line="59"/>
<source>Don't ask again for links from %1</source>
- <translation>Spørg ikke igen om links fra %1</translation>
+ <translation>別再請求來自%1的連結</translation>
</message>
<message>
<location filename="../src/ui/qml/OpenBrowserDialog.qml" line="65"/>
<source>Don't ask again for any links (not recommended!)</source>
- <translation>Spørg ikke om nogen links (ikke anbefalt!)</translation>
+ <translation>別再請求任何連結(不建議!)</translation>
</message>
<message>
<location filename="../src/ui/qml/OpenBrowserDialog.qml" line="72"/>
<source>Open Browser</source>
- <translation>Åbn Browser</translation>
+ <translation>開啟瀏覧器</translation>
</message>
<message>
<location filename="../src/ui/qml/OpenBrowserDialog.qml" line="84"/>
<source>Cancel</source>
- <translation>Annullér</translation>
+ <translation>取消</translation>
</message>
</context>
<context>
@@ -428,32 +436,31 @@
<message>
<location filename="../src/ui/qml/PreferencesDialog.qml" line="12"/>
<source>Ricochet Preferences</source>
- <translation>Indstillinger for Ricochet</translation>
+ <translation>Ricochet 偏好</translation>
</message>
<message>
<location filename="../src/ui/qml/PreferencesDialog.qml" line="41"/>
<source>General</source>
- <translation>Generelt</translation>
+ <translation>一般</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="46"/>
<source>Language</source>
- <translation>Sprog</translation>
+ <translation type="vanished">語言</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="51"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="46"/>
<source>Contacts</source>
- <translation>Kontaktpersoner</translation>
+ <translation>聯絡人</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="56"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="51"/>
<source>Tor</source>
<translation>Tor</translation>
</message>
<message>
- <location filename="../src/ui/qml/PreferencesDialog.qml" line="61"/>
+ <location filename="../src/ui/qml/PreferencesDialog.qml" line="56"/>
<source>About</source>
- <translation>Om</translation>
+ <translation>關於</translation>
</message>
</context>
<context>
@@ -461,7 +468,7 @@
<message>
<location filename="../src/ui/qml/MainWindow.qml" line="29"/>
<source>Preference</source>
- <translation>Indstilling</translation>
+ <translation>偏好</translation>
</message>
</context>
<context>
@@ -469,12 +476,12 @@
<message>
<location filename="../src/ui/qml/StartupStatusPage.qml" line="18"/>
<source>The Tor process was not started successfully. This is most likely an installation or system error.</source>
- <translation>Tor-processen kunne ikke starte. Dette er sandsynligvis en installations- eller systemfejl.</translation>
+ <translation>Tor連結過程並未成功啟動，這大部份是由於安裝或系統出錯</translation>
</message>
<message>
<location filename="../src/ui/qml/StartupStatusPage.qml" line="49"/>
<source>Quit</source>
- <translation>Afslut</translation>
+ <translation>中止</translation>
</message>
</context>
<context>
@@ -483,112 +490,112 @@
<location filename="../src/ui/qml/TorBootstrapStatus.qml" line="17"/>
<source>Connecting to the Tor network…</source>
<extracomment>\u2026 is ellipsis</extracomment>
- <translation>Forbinder til Tor-netværket…</translation>
+ <translation>連線到Tor網路</translation>
</message>
<message>
<location filename="../src/ui/qml/TorBootstrapStatus.qml" line="51"/>
<source>Back</source>
- <translation>Tilbage</translation>
+ <translation>退後</translation>
</message>
<message>
<location filename="../src/ui/qml/TorBootstrapStatus.qml" line="58"/>
<source>Hide details</source>
- <translation>Skjul detaljer</translation>
+ <translation>隱藏細節</translation>
</message>
<message>
<location filename="../src/ui/qml/TorBootstrapStatus.qml" line="58"/>
<source>Show details</source>
- <translation>Vis detaljer</translation>
+ <translation>顯示細節</translation>
</message>
<message>
<location filename="../src/ui/qml/TorBootstrapStatus.qml" line="70"/>
<source>Done</source>
- <translation>Færdig</translation>
+ <translation>完成</translation>
</message>
</context>
<context>
<name>TorConfigurationPage</name>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="72"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="73"/>
<source>Does this computer need a proxy to access the internet?</source>
- <translation>Skal denne computer forbinde gennem en proxy for at tilgå internettet?</translation>
+ <translation>這台電腦是否需要透過代理主機來連網?</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="84"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="85"/>
<source>Proxy type:</source>
- <translation>Proxy type:</translation>
+ <translation>Proxy 類型:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="89"/>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="91"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="90"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="92"/>
<source>None</source>
- <translation>Ingen</translation>
+ <translation>無</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="106"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="107"/>
<source>Address:</source>
- <translation>Adresse:</translation>
+ <translation>地址:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="115"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="116"/>
<source>IP address or hostname</source>
- <translation>IP-adresse eller værtsnavn</translation>
+ <translation>I位置或主機名稱</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="118"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="119"/>
<source>Port:</source>
- <translation>Port:</translation>
+ <translation>埠部:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="129"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="130"/>
<source>Username:</source>
- <translation>Brugernavn:</translation>
+ <translation>使用者名稱:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="139"/>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="149"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="140"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="150"/>
<source>Optional</source>
- <translation>Valgfrit</translation>
+ <translation>選項</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="142"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="143"/>
<source>Password:</source>
- <translation>Adgangskode:</translation>
+ <translation>密碼:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="159"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="160"/>
<source>Does this computer's Internet connection go through a firewall that only allows connections to certain ports?</source>
- <translation>Går denne computers internetforbindelse gennem en firewall der kun tillader forbindelser på visse porte?</translation>
+ <translation>這台電腦的網路連線是否透過防火牆，只能充許某些埠號來連網?</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="170"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="171"/>
<source>Allowed ports:</source>
- <translation>Tilladte porte:</translation>
+ <translation>允許埠部:</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="177"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="178"/>
<source>Example: 80,443</source>
- <translation>Eksempel: 80,443</translation>
+ <translation>示範: 80,443</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="188"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="189"/>
<source>If this computer's Internet connection is censored, you will need to obtain and use bridge relays.</source>
- <translation>Hvis denne computers internetforbindelse er censureret, er du nødt til at finde og benytte bridge relæer.</translation>
+ <translation>如果這台電腦的網路連線遭到監控，你必須改用中續撟接服務</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="197"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="198"/>
<source>Enter one or more bridge relays (one per line):</source>
- <translation>Indsæt én eller flere bridgerelæer (én per linje):</translation>
+ <translation>輸入一個以上的中續橋接(一行一個):</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="212"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="213"/>
<source>Back</source>
- <translation>Tilbage</translation>
+ <translation>退後</translation>
</message>
<message>
- <location filename="../src/ui/qml/TorConfigurationPage.qml" line="219"/>
+ <location filename="../src/ui/qml/TorConfigurationPage.qml" line="220"/>
<source>Connect</source>
- <translation>Forbind</translation>
+ <translation>連線</translation>
</message>
</context>
<context>
@@ -596,67 +603,67 @@
<message>
<location filename="../src/ui/qml/TorPreferences.qml" line="25"/>
<source>Running:</source>
- <translation>Kører:</translation>
+ <translation>執行中:</translation>
</message>
<message>
<location filename="../src/ui/qml/TorPreferences.qml" line="26"/>
<location filename="../src/ui/qml/TorPreferences.qml" line="28"/>
<location filename="../src/ui/qml/TorPreferences.qml" line="30"/>
<source>Yes</source>
- <translation>Ja</translation>
+ <translation>是</translation>
</message>
<message>
<location filename="../src/ui/qml/TorPreferences.qml" line="26"/>
<location filename="../src/ui/qml/TorPreferences.qml" line="28"/>
<location filename="../src/ui/qml/TorPreferences.qml" line="30"/>
<source>No</source>
- <translation>Nej</translation>
+ <translation>否</translation>
</message>
<message>
<location filename="../src/ui/qml/TorPreferences.qml" line="26"/>
<source>External</source>
- <translation>Ekstern</translation>
+ <translation>外部</translation>
</message>
<message>
<location filename="../src/ui/qml/TorPreferences.qml" line="27"/>
<source>Control connected:</source>
- <translation>Kontrol forbundet:</translation>
+ <translation>連線控制:</translation>
</message>
<message>
<location filename="../src/ui/qml/TorPreferences.qml" line="29"/>
<source>Circuits established:</source>
- <translation>Kredsløb etableret:</translation>
+ <translation>已建立巡迴:</translation>
</message>
<message>
<location filename="../src/ui/qml/TorPreferences.qml" line="31"/>
<source>Hidden service:</source>
- <translation>Skjult service:</translation>
+ <translation>隱藏服務:</translation>
</message>
<message>
<location filename="../src/ui/qml/TorPreferences.qml" line="32"/>
<source>Online</source>
- <translation>Online</translation>
+ <translation>上線</translation>
</message>
<message>
<location filename="../src/ui/qml/TorPreferences.qml" line="32"/>
<source>Offline</source>
- <translation>Offline</translation>
+ <translation>離線</translation>
</message>
<message>
<location filename="../src/ui/qml/TorPreferences.qml" line="33"/>
<source>Version:</source>
- <translation>Version:</translation>
+ <translation>版本:</translation>
</message>
<message>
<location filename="../src/ui/qml/TorPreferences.qml" line="60"/>
<source>Error: <b>%1</b></source>
<extracomment>%1 is error message</extracomment>
- <translation>Fejl: <b>%1</b></translation>
+ <translation><b>%1</b>出錯</translation>
</message>
<message>
<location filename="../src/ui/qml/TorPreferences.qml" line="76"/>
<source>Configure</source>
- <translation>Konfigurér</translation>
+ <translation>設定</translation>
</message>
</context>
<context>
@@ -665,30 +672,30 @@
<location filename="../src/ui/qml/TorStateWidget.qml" line="9"/>
<location filename="../src/ui/qml/TorStateWidget.qml" line="20"/>
<source>Connection failed</source>
- <translation>Forbindelse mislykkedes</translation>
+ <translation>連線失敗</translation>
</message>
<message>
<location filename="../src/ui/qml/TorStateWidget.qml" line="12"/>
<location filename="../src/ui/qml/TorStateWidget.qml" line="22"/>
<source>Connecting…</source>
<extracomment>\u2026 is ellipsis</extracomment>
- <translation>Forbinder…</translation>
+ <translation>連線中</translation>
</message>
<message>
<location filename="../src/ui/qml/TorStateWidget.qml" line="25"/>
<source>Connecting… (%1%)</source>
<extracomment>%1 is progress percentage, e.g. 100</extracomment>
- <translation>Forbinder… (%1)</translation>
+ <translation>(%1%)連線中… </translation>
</message>
<message>
<location filename="../src/ui/qml/TorStateWidget.qml" line="32"/>
<source>Online</source>
- <translation>Online</translation>
+ <translation>上線</translation>
</message>
<message>
<location filename="../src/ui/qml/TorStateWidget.qml" line="34"/>
<source>Connected</source>
- <translation>Forbundet</translation>
+ <translation>已連結</translation>
</message>
</context>
</TS>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/ricochet-im.git
More information about the Pkg-privacy-commits
mailing list