tor-commits
Threads by month
- ----- 2025 -----
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
March 2014
- 22 participants
- 2036 discussions

30 Mar '14
commit 93a1c3135730f10575e6a0aa368bedd087cb4618
Author: David Fifield <david(a)bamsoftware.com>
Date: Mon Mar 24 14:47:28 2014 -0700
Use a TORSOCKS make variable.
This allows you to selectively disable torsocks from the command line
using a command like
make prep TORSOCKS=
---
gitian/Makefile | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/gitian/Makefile b/gitian/Makefile
index e483735..cec338d 100644
--- a/gitian/Makefile
+++ b/gitian/Makefile
@@ -1,3 +1,5 @@
+TORSOCKS = torsocks
+
all: clean prep build
nightly: clean prep-nightly build-nightly
@@ -31,32 +33,32 @@ build-beta:
./hash-bundles.sh versions.beta
sign:
- torsocks ./upload-signature.sh versions
+ $(TORSOCKS) ./upload-signature.sh versions
sign-alpha:
- torsocks ./upload-signature.sh versions.alpha
+ $(TORSOCKS) ./upload-signature.sh versions.alpha
sign-nightly:
./upload-signature.sh versions.nightly
sign-beta:
- torsocks ./upload-signature.sh versions.beta
+ $(TORSOCKS) ./upload-signature.sh versions.beta
match:
- torsocks ./check-match.sh versions
+ $(TORSOCKS) ./check-match.sh versions
match-nightly:
./check-match.sh versions.nightly
match-alpha:
- torsocks ./check-match.sh versions.alpha
+ $(TORSOCKS) ./check-match.sh versions.alpha
match-beta:
- torsocks ./check-match.sh versions.beta
+ $(TORSOCKS) ./check-match.sh versions.beta
prep:
./check-prerequisites.sh
- torsocks ./fetch-inputs.sh ../../gitian-builder/inputs/ versions
+ $(TORSOCKS) ./fetch-inputs.sh ../../gitian-builder/inputs/ versions
prep-nightly:
./check-prerequisites.sh
@@ -64,11 +66,11 @@ prep-nightly:
prep-alpha:
./check-prerequisites.sh
- torsocks ./fetch-inputs.sh ../../gitian-builder/inputs/ versions.alpha
+ $(TORSOCKS) ./fetch-inputs.sh ../../gitian-builder/inputs/ versions.alpha
prep-beta:
./check-prerequisites.sh
- torsocks ./fetch-inputs.sh ../../gitian-builder/inputs/ versions.beta
+ $(TORSOCKS) ./fetch-inputs.sh ../../gitian-builder/inputs/ versions.beta
clean:
rm -f ../../gitian-builder/inputs/*gbuilt*
1
0

[tor-browser-bundle/master] Document the TORSOCKS make variable.
by mikeperry@torproject.org 30 Mar '14
by mikeperry@torproject.org 30 Mar '14
30 Mar '14
commit 9dbf4b46d11d0fd28567f31c7e5247729d62ac48
Author: Mike Perry <mikeperry-git(a)torproject.org>
Date: Sat Mar 29 22:09:19 2014 -0700
Document the TORSOCKS make variable.
---
gitian/README.build | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/gitian/README.build b/gitian/README.build
index f9672d8..ece4cb6 100644
--- a/gitian/README.build
+++ b/gitian/README.build
@@ -16,9 +16,10 @@ QuickStart:
$ make match
By default, the Makefile wraps input downloads in 'torsocks'. This is done
- to allow unofficial secret verifiers to remain secret by default. Removing
- the 'torsocks' from the 'prep' Makefile rule should be sufficient to avoid
- using Tor.
+ to allow unofficial secret verifiers to remain secret by default. To download
+ inputs without torsocks, run:
+
+ $ make TORSOCKS=
By default, 'make' will also clear out any previous partial builds. See the
"Partial Rebuilds" section for information on performing partial rebuilds
1
0

[tor-browser-bundle/master] Use multiple flashproxy bridge lines.
by mikeperry@torproject.org 30 Mar '14
by mikeperry@torproject.org 30 Mar '14
30 Mar '14
commit e535fe31cd518ab44f8cdf0785316bd39b962bc5
Author: David Fifield <david(a)bamsoftware.com>
Date: Mon Mar 17 06:27:08 2014 +0000
Use multiple flashproxy bridge lines.
In https://trac.torproject.org/projects/tor/ticket/10429#comment:2 we
got a bit better reliability with more bridge lines. This doesn't cause
flashproxy-client to send more registration methods, but it does hint to
tor that if a bridge is being slow or unreliable it can try connecting
again to get another.
The corresponding change in the flashproxy repo is
https://gitweb.torproject.org/flashproxy.git/commitdiff/51bdfe59cad37a5f2ff….
---
Bundle-Data/PTConfigs/bridge_prefs.js | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js
index 9a3dfc2..47d20e8 100644
--- a/Bundle-Data/PTConfigs/bridge_prefs.js
+++ b/Bundle-Data/PTConfigs/bridge_prefs.js
@@ -11,6 +11,10 @@ pref("extensions.torlauncher.default_bridge.obfs3.6", "obfs3 109.105.109.163:389
pref("extensions.torlauncher.default_bridge.obfs3.7", "obfs3 109.105.109.163:47779 844B1F53FFD548C998F8D3B01B7E19FA07C3396E");
pref("extensions.torlauncher.default_bridge.flashproxy.1", "flashproxy 0.0.1.0:1");
+pref("extensions.torlauncher.default_bridge.flashproxy.2", "flashproxy 0.0.1.0:2");
+pref("extensions.torlauncher.default_bridge.flashproxy.3", "flashproxy 0.0.1.0:3");
+pref("extensions.torlauncher.default_bridge.flashproxy.4", "flashproxy 0.0.1.0:4");
+pref("extensions.torlauncher.default_bridge.flashproxy.5", "flashproxy 0.0.1.0:5");
pref("extensions.torlauncher.default_bridge.fte.1", "fte 131.252.210.150:8080 271EC1874E40FE65C145C6397AA34FFF7008E50E");
pref("extensions.torlauncher.default_bridge.fte.2", "fte 79.125.3.12:8080 17AF9F9F4E57614A060B7221DCCEDB8BB546DD73");
1
0

[tor-browser-bundle/master] Bug 11200: Prevent spurious error message prior to enabling network.
by mikeperry@torproject.org 30 Mar '14
by mikeperry@torproject.org 30 Mar '14
30 Mar '14
commit 20b1a0c82f3d29b6d23f1de3e55a18ff74f54dcf
Author: Mike Perry <mikeperry-git(a)torproject.org>
Date: Sat Mar 29 21:51:32 2014 -0700
Bug 11200: Prevent spurious error message prior to enabling network.
---
gitian/descriptors/linux/gitian-tor.yml | 2 ++
gitian/descriptors/mac/gitian-tor.yml | 2 ++
gitian/descriptors/windows/gitian-tor.yml | 5 +++-
gitian/patches/bug11200.patch | 39 +++++++++++++++++++++++++++++
4 files changed, 47 insertions(+), 1 deletion(-)
diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml
index 73181a0..bb795c0 100644
--- a/gitian/descriptors/linux/gitian-tor.yml
+++ b/gitian/descriptors/linux/gitian-tor.yml
@@ -29,6 +29,7 @@ files:
- "bug9229.patch"
- "bug11156.patch"
- "bug11069.patch"
+- "bug11200.patch"
- "dzip.sh"
- "openssl.tar.gz"
script: |
@@ -95,6 +96,7 @@ script: |
git am ~/build/bug5018.patch
git am ~/build/bug11069.patch
git am ~/build/bug11156.patch
+ git am ~/build/bug11200.patch
fi
fi
mkdir -p $OUTDIR/src
diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml
index 8b049b0..129a3fe 100644
--- a/gitian/descriptors/mac/gitian-tor.yml
+++ b/gitian/descriptors/mac/gitian-tor.yml
@@ -29,6 +29,7 @@ files:
- "bug5018.patch"
- "bug9229.patch"
- "bug11156.patch"
+- "bug11200.patch"
- "bug11069.patch"
- "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb"
- "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz"
@@ -106,6 +107,7 @@ script: |
git am ~/build/bug5018.patch
git am ~/build/bug11069.patch
git am ~/build/bug11156.patch
+ git am ~/build/bug11200.patch
fi
fi
mkdir -p $OUTDIR/src
diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml
index 3d05eaa..5cceac9 100644
--- a/gitian/descriptors/windows/gitian-tor.yml
+++ b/gitian/descriptors/windows/gitian-tor.yml
@@ -28,6 +28,7 @@ files:
- "bug5018.patch"
- "bug9229.patch"
- "bug11156.patch"
+- "bug11200.patch"
- "bug11069.patch"
- "binutils.tar.bz2"
- "dzip.sh"
@@ -102,7 +103,9 @@ script: |
git am ~/build/bug5018.patch
git am ~/build/bug11069.patch
git am ~/build/bug11156.patch
- fi fi
+ git am ~/build/bug11200.patch
+ fi
+ fi
mkdir -p $OUTDIR/src
git archive HEAD | tar -x -C $OUTDIR/src
./autogen.sh
diff --git a/gitian/patches/bug11200.patch b/gitian/patches/bug11200.patch
new file mode 100644
index 0000000..040309a
--- /dev/null
+++ b/gitian/patches/bug11200.patch
@@ -0,0 +1,39 @@
+From 6770153d4ced726e54305ad38d14ea82df0d639e Mon Sep 17 00:00:00 2001
+From: Nick Mathewson <nickm(a)torproject.org>
+Date: Sat, 29 Mar 2014 21:49:32 -0700
+Subject: [PATCH] should_disable_dir_fetches() now returns 1 if
+ DisableNetwork==1
+
+This change prevents LD_BUG warnings and bootstrap failure messages
+when we try to do directory fetches when starting with
+DisableNetwork == 1, a consensus present, but no descriptors (or
+insufficient descriptors) yet.
+
+Fixes bug 11200 and bug 10405. It's a bugfix on 0.2.3.9-alpha.
+Thanks to mcs for walking me through the repro instructions!
+---
+ src/or/networkstatus.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
+index bcadc52..9a1824b 100644
+--- a/src/or/networkstatus.c
++++ b/src/or/networkstatus.c
+@@ -1394,6 +1394,14 @@ should_delay_dir_fetches(const or_options_t *options, const char **msg_out)
+ *msg_out = NULL;
+ }
+
++ if (options->DisableNetwork) {
++ if (msg_out) {
++ *msg_out = "DisableNetwork is set.";
++ }
++ log_info(LD_DIR, "Delaying dir fetches (DisableNetwork is set)");
++ return 1;
++ }
++
+ if (options->UseBridges) {
+ if (!any_bridge_descriptors_known()) {
+ if (msg_out) {
+--
+1.8.1.2
+
1
0

[tor-browser-bundle/master] Fix up backport application so that nightlies contain unmerged patches.
by mikeperry@torproject.org 30 Mar '14
by mikeperry@torproject.org 30 Mar '14
30 Mar '14
commit 440b4c5d059acfa744f9c12c9e3b13f81bbc6140
Author: Mike Perry <mikeperry-git(a)torproject.org>
Date: Sat Mar 29 22:02:13 2014 -0700
Fix up backport application so that nightlies contain unmerged patches.
---
gitian/descriptors/linux/gitian-tor.yml | 4 ++--
gitian/descriptors/mac/gitian-tor.yml | 4 ++--
gitian/descriptors/windows/gitian-tor.yml | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml
index bb795c0..698fcba 100644
--- a/gitian/descriptors/linux/gitian-tor.yml
+++ b/gitian/descriptors/linux/gitian-tor.yml
@@ -90,14 +90,14 @@ script: |
git am ~/build/bug10297.patch
fi
if [ $BUILD_PT_BUNDLES ]; then
+ git am ~/build/bug9229.patch
if [ ${TOR_TAG::9} == "tor-0.2.4" ];
then
- git am ~/build/bug9229.patch
git am ~/build/bug5018.patch
git am ~/build/bug11069.patch
git am ~/build/bug11156.patch
- git am ~/build/bug11200.patch
fi
+ git am ~/build/bug11200.patch
fi
mkdir -p $OUTDIR/src
#git archive HEAD | tar -x -C $OUTDIR/src
diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml
index 129a3fe..30c23bb 100644
--- a/gitian/descriptors/mac/gitian-tor.yml
+++ b/gitian/descriptors/mac/gitian-tor.yml
@@ -101,14 +101,14 @@ script: |
git am ~/build/bug10297.patch
fi
if [ $BUILD_PT_BUNDLES ]; then
+ git am ~/build/bug9229.patch
if [ ${TOR_TAG::9} == "tor-0.2.4" ];
then
- git am ~/build/bug9229.patch
git am ~/build/bug5018.patch
git am ~/build/bug11069.patch
git am ~/build/bug11156.patch
- git am ~/build/bug11200.patch
fi
+ git am ~/build/bug11200.patch
fi
mkdir -p $OUTDIR/src
git archive HEAD | tar -x -C $OUTDIR/src
diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml
index 5cceac9..1698726 100644
--- a/gitian/descriptors/windows/gitian-tor.yml
+++ b/gitian/descriptors/windows/gitian-tor.yml
@@ -97,14 +97,14 @@ script: |
git am ~/build/bug10297.patch
fi
if [ $BUILD_PT_BUNDLES ]; then
+ git am ~/build/bug9229.patch
if [ ${TOR_TAG::9} == "tor-0.2.4" ];
then
- git am ~/build/bug9229.patch
git am ~/build/bug5018.patch
git am ~/build/bug11069.patch
git am ~/build/bug11156.patch
- git am ~/build/bug11200.patch
fi
+ git am ~/build/bug11200.patch
fi
mkdir -p $OUTDIR/src
git archive HEAD | tar -x -C $OUTDIR/src
1
0

[tor-browser-bundle/master] Bug #11190: Switch linux PT build process to python2.
by mikeperry@torproject.org 30 Mar '14
by mikeperry@torproject.org 30 Mar '14
30 Mar '14
commit 843b30a1c9c1886feb563d151104b6e5494abd6e
Author: Mike Perry <mikeperry-git(a)torproject.org>
Date: Sat Mar 29 21:26:00 2014 -0700
Bug #11190: Switch linux PT build process to python2.
Fixes arch and other distros that think 'python' should be python3.
---
.../descriptors/linux/gitian-pluggable-transports.yml | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml
index 665c9bd..6619a1c 100644
--- a/gitian/descriptors/linux/gitian-pluggable-transports.yml
+++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml
@@ -42,6 +42,7 @@ script: |
export FAKETIME=$REFERENCE_DATETIME
export TZ=UTC
export LC_ALL=C
+ export PYTHON=python2
umask 0022
#
# Config options for hardening-wrapper
@@ -65,41 +66,41 @@ script: |
#
cd pyptlib
find -type f | xargs touch --date="$REFERENCE_DATETIME"
- python setup.py build --build-lib build
+ $PYTHON setup.py build --build-lib build
cp -a build/pyptlib $PTDIR/
cd ..
#
tar xzf pycrypto.tar.gz
cd pycrypto-*
find -type f | xargs touch --date="$REFERENCE_DATETIME"
- python setup.py build --build-lib build
+ $PYTHON setup.py build --build-lib build
cp -a build/Crypto $PTDIR/
cd ..
#
tar xzf argparse.tar.gz
cd argparse-*
find -type f | xargs touch --date="$REFERENCE_DATETIME"
- python setup.py build --build-lib build
+ $PYTHON setup.py build --build-lib build
cp -a build/argparse.py $PTDIR/
cd ..
#
unzip zope.interface.zip
cd zope.interface-*
find -type f | xargs touch --date="$REFERENCE_DATETIME"
- python setup.py build --build-lib build
+ $PYTHON setup.py build --build-lib build
cp -a build/zope $PTDIR/
cd ..
#
tar xjf twisted.tar.bz2
cd Twisted-*
find -type f | xargs touch --date="$REFERENCE_DATETIME"
- python setup.py build --build-lib build
+ $PYTHON setup.py build --build-lib build
cp -a build/twisted $PTDIR/
cd ..
#
cd obfsproxy
find -type f | xargs touch --date="$REFERENCE_DATETIME"
- python setup.py build --build-lib build
+ $PYTHON setup.py build --build-lib build
cp -a build/obfsproxy $PTDIR/
cp -a bin/obfsproxy $PTDIR/obfsproxy.bin
mkdir -p $INSTDIR/Docs/Obfsproxy
@@ -118,8 +119,8 @@ script: |
tar xzf m2crypto.tar.gz
cd M2Crypto-*
find -type f | xargs touch --date="$REFERENCE_DATETIME"
- python setup.py build_ext --build-lib build --openssl $INSTDIR/openssl
- python setup.py build --build-lib build
+ $PYTHON setup.py build_ext --build-lib build --openssl $INSTDIR/openssl
+ $PYTHON setup.py build --build-lib build
cp -a build/M2Crypto $PTDIR/
cd ..
#
1
0

[torbutton/master] Merge remote-tracking branch 'brade/bug10398'
by mikeperry@torproject.org 30 Mar '14
by mikeperry@torproject.org 30 Mar '14
30 Mar '14
commit a9a3b8f1cc3aeddbc0abc621ade08680ef09e146
Merge: 838c372 54c8721
Author: Mike Perry <mikeperry-git(a)torproject.org>
Date: Sat Mar 29 21:18:10 2014 -0700
Merge remote-tracking branch 'brade/bug10398'
Conflicts:
src/chrome/content/aboutTor/aboutTor.xhtml
src/chrome/locale/eu/aboutTor.dtd
src/chrome/locale/fa/aboutTor.dtd
src/chrome/locale/ja/aboutTor.dtd
src/chrome/content/aboutTor/aboutTor.xhtml | 24 +++++++++++++++++++++++-
src/chrome/locale/af/aboutTor.dtd | 19 +------------------
src/chrome/locale/af/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/ak/aboutTor.dtd | 19 +------------------
src/chrome/locale/ak/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/am/aboutTor.dtd | 19 +------------------
src/chrome/locale/am/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/ar/aboutTor.dtd | 27 +--------------------------
src/chrome/locale/ar/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/arn/aboutTor.dtd | 19 +------------------
src/chrome/locale/arn/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/ast/aboutTor.dtd | 19 +------------------
src/chrome/locale/ast/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/az/aboutTor.dtd | 19 +------------------
src/chrome/locale/az/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/be/aboutTor.dtd | 19 +------------------
src/chrome/locale/be/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/bg/aboutTor.dtd | 19 +------------------
src/chrome/locale/bg/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/bms/aboutTor.dtd | 19 +------------------
src/chrome/locale/bms/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/bn-IN/aboutTor.dtd | 19 +------------------
src/chrome/locale/bn-IN/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/bn/aboutTor.dtd | 19 +------------------
src/chrome/locale/bn/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/bo/aboutTor.dtd | 19 +------------------
src/chrome/locale/bo/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/br/aboutTor.dtd | 19 +------------------
src/chrome/locale/br/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/bs/aboutTor.dtd | 19 +------------------
src/chrome/locale/bs/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/ca/aboutTor.dtd | 19 +------------------
src/chrome/locale/ca/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/cs/aboutTor.dtd | 19 +------------------
src/chrome/locale/cs/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/csb/aboutTor.dtd | 19 +------------------
src/chrome/locale/csb/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/cy/aboutTor.dtd | 19 +------------------
src/chrome/locale/cy/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/da/aboutTor.dtd | 19 +------------------
src/chrome/locale/da/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/de/aboutTor.dtd | 27 +--------------------------
src/chrome/locale/de/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/dz/aboutTor.dtd | 19 +------------------
src/chrome/locale/dz/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/el/aboutTor.dtd | 19 +------------------
src/chrome/locale/el/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/en/aboutTor.dtd | 27 +--------------------------
src/chrome/locale/en/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/eo/aboutTor.dtd | 19 +------------------
src/chrome/locale/eo/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/es/aboutTor.dtd | 27 +--------------------------
src/chrome/locale/es/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/et/aboutTor.dtd | 19 +------------------
src/chrome/locale/et/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/eu/aboutTor.dtd | 18 +-----------------
src/chrome/locale/eu/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/fa/aboutTor.dtd | 27 +--------------------------
src/chrome/locale/fa/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/fi/aboutTor.dtd | 19 +------------------
src/chrome/locale/fi/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/fil/aboutTor.dtd | 19 +------------------
src/chrome/locale/fil/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/fo/aboutTor.dtd | 19 +------------------
src/chrome/locale/fo/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/fr/aboutTor.dtd | 27 +--------------------------
src/chrome/locale/fr/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/fur/aboutTor.dtd | 19 +------------------
src/chrome/locale/fur/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/fy/aboutTor.dtd | 19 +------------------
src/chrome/locale/fy/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/ga/aboutTor.dtd | 19 +------------------
src/chrome/locale/ga/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/gl/aboutTor.dtd | 19 +------------------
src/chrome/locale/gl/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/gu/aboutTor.dtd | 19 +------------------
src/chrome/locale/gu/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/gun/aboutTor.dtd | 19 +------------------
src/chrome/locale/gun/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/ha/aboutTor.dtd | 19 +------------------
src/chrome/locale/ha/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/he/aboutTor.dtd | 19 +------------------
src/chrome/locale/he/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/hi/aboutTor.dtd | 19 +------------------
src/chrome/locale/hi/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/hr/aboutTor.dtd | 19 +------------------
src/chrome/locale/hr/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/ht/aboutTor.dtd | 19 +------------------
src/chrome/locale/ht/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/hu/aboutTor.dtd | 19 +------------------
src/chrome/locale/hu/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/hy/aboutTor.dtd | 19 +------------------
src/chrome/locale/hy/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/id/aboutTor.dtd | 19 +------------------
src/chrome/locale/id/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/is/aboutTor.dtd | 19 +------------------
src/chrome/locale/is/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/it/aboutTor.dtd | 27 +--------------------------
src/chrome/locale/it/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/ja/aboutTor.dtd | 27 +--------------------------
src/chrome/locale/ja/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/jv/aboutTor.dtd | 19 +------------------
src/chrome/locale/jv/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/ka/aboutTor.dtd | 19 +------------------
src/chrome/locale/ka/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/km/aboutTor.dtd | 19 +------------------
src/chrome/locale/km/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/kn/aboutTor.dtd | 19 +------------------
src/chrome/locale/kn/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/ko/aboutTor.dtd | 27 +--------------------------
src/chrome/locale/ko/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/ku/aboutTor.dtd | 19 +------------------
src/chrome/locale/ku/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/kw/aboutTor.dtd | 19 +------------------
src/chrome/locale/kw/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/ky/aboutTor.dtd | 19 +------------------
src/chrome/locale/ky/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/lb/aboutTor.dtd | 19 +------------------
src/chrome/locale/lb/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/lg/aboutTor.dtd | 19 +------------------
src/chrome/locale/lg/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/ln/aboutTor.dtd | 19 +------------------
src/chrome/locale/ln/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/lo/aboutTor.dtd | 19 +------------------
src/chrome/locale/lo/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/lt/aboutTor.dtd | 19 +------------------
src/chrome/locale/lt/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/lv/aboutTor.dtd | 19 +------------------
src/chrome/locale/lv/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/mg/aboutTor.dtd | 19 +------------------
src/chrome/locale/mg/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/mi/aboutTor.dtd | 19 +------------------
src/chrome/locale/mi/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/mk/aboutTor.dtd | 19 +------------------
src/chrome/locale/mk/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/ml/aboutTor.dtd | 19 +------------------
src/chrome/locale/ml/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/mn/aboutTor.dtd | 19 +------------------
src/chrome/locale/mn/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/mr/aboutTor.dtd | 19 +------------------
src/chrome/locale/mr/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/ms/aboutTor.dtd | 19 +------------------
src/chrome/locale/ms/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/mt/aboutTor.dtd | 19 +------------------
src/chrome/locale/mt/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/my/aboutTor.dtd | 19 +------------------
src/chrome/locale/my/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/nah/aboutTor.dtd | 19 +------------------
src/chrome/locale/nah/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/nap/aboutTor.dtd | 19 +------------------
src/chrome/locale/nap/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/nb/aboutTor.dtd | 19 +------------------
src/chrome/locale/nb/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/ne/aboutTor.dtd | 19 +------------------
src/chrome/locale/ne/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/nl/aboutTor.dtd | 27 +--------------------------
src/chrome/locale/nl/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/nn/aboutTor.dtd | 19 +------------------
src/chrome/locale/nn/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/nso/aboutTor.dtd | 19 +------------------
src/chrome/locale/nso/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/oc/aboutTor.dtd | 19 +------------------
src/chrome/locale/oc/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/or/aboutTor.dtd | 19 +------------------
src/chrome/locale/or/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/pa/aboutTor.dtd | 19 +------------------
src/chrome/locale/pa/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/pap/aboutTor.dtd | 19 +------------------
src/chrome/locale/pap/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/pl/aboutTor.dtd | 27 +--------------------------
src/chrome/locale/pl/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/pms/aboutTor.dtd | 19 +------------------
src/chrome/locale/pms/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/ps/aboutTor.dtd | 19 +------------------
src/chrome/locale/ps/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/pt-BR/aboutTor.dtd | 19 +------------------
src/chrome/locale/pt-BR/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/pt/aboutTor.dtd | 27 +--------------------------
src/chrome/locale/pt/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/ro/aboutTor.dtd | 19 +------------------
src/chrome/locale/ro/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/ru/aboutTor.dtd | 27 +--------------------------
src/chrome/locale/ru/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/sco/aboutTor.dtd | 19 +------------------
src/chrome/locale/sco/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/sk/aboutTor.dtd | 19 +------------------
src/chrome/locale/sk/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/sl/aboutTor.dtd | 19 +------------------
src/chrome/locale/sl/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/so/aboutTor.dtd | 19 +------------------
src/chrome/locale/so/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/son/aboutTor.dtd | 19 +------------------
src/chrome/locale/son/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/sq/aboutTor.dtd | 19 +------------------
src/chrome/locale/sq/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/sr/aboutTor.dtd | 19 +------------------
src/chrome/locale/sr/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/st/aboutTor.dtd | 19 +------------------
src/chrome/locale/st/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/su/aboutTor.dtd | 19 +------------------
src/chrome/locale/su/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/sv/aboutTor.dtd | 19 +------------------
src/chrome/locale/sv/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/sw/aboutTor.dtd | 19 +------------------
src/chrome/locale/sw/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/ta/aboutTor.dtd | 19 +------------------
src/chrome/locale/ta/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/te/aboutTor.dtd | 19 +------------------
src/chrome/locale/te/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/tg/aboutTor.dtd | 19 +------------------
src/chrome/locale/tg/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/th/aboutTor.dtd | 19 +------------------
src/chrome/locale/th/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/ti/aboutTor.dtd | 19 +------------------
src/chrome/locale/ti/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/tk/aboutTor.dtd | 19 +------------------
src/chrome/locale/tk/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/tr/aboutTor.dtd | 19 +------------------
src/chrome/locale/tr/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/uk/aboutTor.dtd | 19 +------------------
src/chrome/locale/uk/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/ur/aboutTor.dtd | 19 +------------------
src/chrome/locale/ur/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/ve/aboutTor.dtd | 19 +------------------
src/chrome/locale/ve/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/vi/aboutTor.dtd | 27 +--------------------------
src/chrome/locale/vi/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/wa/aboutTor.dtd | 19 +------------------
src/chrome/locale/wa/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/wo/aboutTor.dtd | 19 +------------------
src/chrome/locale/wo/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/zh-CN/aboutTor.dtd | 27 +--------------------------
src/chrome/locale/zh-CN/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/zh-HK/aboutTor.dtd | 19 +------------------
src/chrome/locale/zh-HK/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/zh-TW/aboutTor.dtd | 19 +------------------
src/chrome/locale/zh-TW/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/zu/aboutTor.dtd | 19 +------------------
src/chrome/locale/zu/aboutTor.properties | 15 +++++++++++++++
239 files changed, 1927 insertions(+), 2262 deletions(-)
diff --cc src/chrome/content/aboutTor/aboutTor.xhtml
index 6efe617,02e0c7c..b99bc7e
--- a/src/chrome/content/aboutTor/aboutTor.xhtml
+++ b/src/chrome/content/aboutTor/aboutTor.xhtml
@@@ -25,8 -25,10 +25,10 @@@
<![CDATA[
function onLoad()
{
+ insertPropertyStrings();
+
- window.addEventListener("resize", function() {
- resizeToolbarIconArrow();
+ document.addEventListener("AboutTorAdjustArrow", function() {
+ adjustToolbarIconArrow();
}, false);
window.setTimeout( function() {
@@@ -35,74 -37,36 +37,94 @@@
}, 0);
}
-function resizeToolbarIconArrow()
+function adjustToolbarIconArrow()
{
var textElem = document.getElementById("updatePrompt");
- var rightDiv = document.getElementById("toolbarIconArrowRight");
- if (textElem && rightDiv)
+ var arrowDiv = document.getElementById("toolbarIconArrow");
+ var extDiv = document.getElementById("toolbarIconArrowExtension");
+ if (textElem && arrowDiv && extDiv)
{
- var width = textElem.offsetLeft - rightDiv.offsetLeft - 6;
- rightDiv.style.width = width + "px";
+ var tbXpos;
+ if (document.body.hasAttribute("torbutton-xpos"))
+ tbXpos = parseInt(document.body.getAttribute("torbutton-xpos"), 10);
+
+ if (!tbXpos || isNaN(tbXpos) || (tbXpos < 0))
+ {
+ arrowDiv.style.display = "none";
+ extDiv.style.display = "none";
+ return;
+ }
+
+ // Account for content zoom and retina displays by converting to device
+ // independent units.
+ if ("devicePixelRatio" in window) // FF18+
+ tbXpos /= window.devicePixelRatio;
+
+ const kArrowMargin = 6;
+ arrowDiv.style.display = "block"; // Must be visible to get offsetWidth.
+ var arrowHalfWidth = arrowDiv.offsetWidth / 2.0;
+ var leftAnchor = textElem.offsetLeft - kArrowMargin - arrowHalfWidth;
+ var rightAnchor = textElem.offsetLeft + textElem.offsetWidth
+ + kArrowMargin + arrowHalfWidth;
+
+ var arrowDisplay = "block";
+ var extDisplay = "block";
+ if (tbXpos < leftAnchor)
+ {
+ // Toolbar button to left of text.
+ arrowDiv.setAttribute("pos", "left");
+ arrowDiv.style.left = (tbXpos - arrowHalfWidth) + "px";
+ var extLeft = tbXpos + arrowHalfWidth;
+ extDiv.style.left = extLeft + "px";
+ extDiv.style.width = (textElem.offsetLeft - extLeft - kArrowMargin) + "px";
+ }
+ else if ((tbXpos > rightAnchor) &&
+ (tbXpos < (window.innerWidth - arrowHalfWidth)))
+ {
+ // Toolbar button to right of text.
+ arrowDiv.setAttribute("pos", "right");
+ arrowDiv.style.left = (tbXpos - arrowHalfWidth) + "px";
+ var extLeft = rightAnchor - arrowHalfWidth;
+ extDiv.style.left = extLeft + "px";
+ extDiv.style.width = (tbXpos - arrowHalfWidth - extLeft) + "px";
+ }
+ else if ((tbXpos >= leftAnchor) && (tbXpos <= rightAnchor))
+ {
+ // Toolbar button in middle about text; use arrow without a tail.
+ arrowDiv.setAttribute("pos", "middle");
+ arrowDiv.style.left = (tbXpos - arrowHalfWidth) + "px";
+ extDisplay = "none";
+ }
+ else // Unable to display arrow (e.g., toolbar button is above sidebar).
+ {
+ arrowDisplay = "none";
+ extDisplay = "none";
+ }
+
+ arrowDiv.style.display = arrowDisplay;
+ extDiv.style.display = extDisplay;
}
}
+
+ function insertPropertyStrings()
+ {
+ try {
+ var kPropertiesURL = "chrome://torbutton/locale/aboutTor.properties";
+
+ Components.utils.import("resource://gre/modules/Services.jsm");
+ var gStringBundle = Services.strings.createBundle(kPropertiesURL);
+ var s1 = gStringBundle.GetStringFromName("aboutTor.searchSP.privacy.link");
+ var s2 = gStringBundle.GetStringFromName("aboutTor.searchSP.search.link");
+ var result = gStringBundle.formatStringFromName("aboutTor.searchSP.privacy",
+ [s1, s2], 2);
+ if (result) {
+ var elem = document.getElementById("searchProviderInfo");
+ if (elem)
+ elem.innerHTML = result;
+ }
+ } catch(e) {};
+ }
+
]]>
</script>
</head>
diff --cc src/chrome/locale/eu/aboutTor.dtd
index 7b07102,9f14022..157346e
--- a/src/chrome/locale/eu/aboutTor.dtd
+++ b/src/chrome/locale/eu/aboutTor.dtd
@@@ -21,53 -21,27 +21,37 @@@
<!ENTITY aboutTor.failure3Link "help(a)rt.torproject.org">
<!ENTITY aboutTor.failure3suffix.label ".">
-<!ENTITY aboutTor.search.label "Search">
-<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
+<!ENTITY aboutTor.search.label "Bilatu">
+
+<!-- Note to translators: the following 18 entities are used to construct a
+ - sentence (either the SP or DDG entities are used, but not both at the
+ - same time). In English, the sentence reads:
+ - Search securely with Startpage.
+ - or:
+ - Search securely with DuckDuckGo.
+ - The sentence contains two embedded links for "securely" and
+ - the search engine ("Startpage" or "DuckDuckGo").
+ -->
+<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
- <!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Bilatu">
- <!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Bilatu">
- <!ENTITY aboutTor.searchSP.privacy.label "segurtasunez">
- <!ENTITY aboutTor.searchDDG.privacy.label "segurtasunez">
- <!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html">
- <!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
- <!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;">
- <!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;">
- <!ENTITY aboutTor.searchSP.search.beforeLink.label "rekin">
- <!ENTITY aboutTor.searchDDG.search.beforeLink.label "rekin">
- <!ENTITY aboutTor.searchSP.search.label "Startpage">
- <!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
- <!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
- <!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
- <!ENTITY aboutTor.searchSP.search.afterLink.label ".">
- <!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
-<!ENTITY aboutTor.torInfo1.label "Additional Info:">
-<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
-<!ENTITY aboutTor.torInfo3.label "Exit Node:">
-<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
-<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
-<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
-<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous »">
+<!ENTITY aboutTor.torInfo1.label "Informazio gehiago:">
+<!ENTITY aboutTor.torInfo2.label "Herrialde eta IP helbidea:">
+<!ENTITY aboutTor.torInfo3.label "Irteera nodoa:">
+<!ENTITY aboutTor.torInfo4.label "Ostalari honek ez du bisitarien inguruko inolako informaziorik biltzen.">
+<!ENTITY aboutTor.whatnextQuestion.label "Eta orain zer?">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor EZ da anonimoki nabigatzeko behar duzun guztia! Baliteke zure nabigatze ohitura batzuk aldatu behar izatea zure nortasuna seguru mantentzen dela ziurtatzeko.">
+<!ENTITY aboutTor.whatnext.label "Anonimo mantentzeko aholkuak »">
<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning">
-<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
-<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
-<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node »">
+<!ENTITY aboutTor.helpInfo1.label "Lagundu dezakezu!">
+<!ENTITY aboutTor.helpInfo2.label "Tor sarea bizkorragoa eta indartsuagoa egiteko hainbat modutan lagundu dezakezu:">
+<!ENTITY aboutTor.helpInfo3.label "Tor errele nodo bat exekutatu »">
<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en">
-<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services »">
+<!ENTITY aboutTor.helpInfo4.label "Zure zerbitzuak bolondrestu »">
<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en">
-<!ENTITY aboutTor.helpInfo5.label "Make a Donation »">
+<!ENTITY aboutTor.helpInfo5.label "Dohaintza egin »">
<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en">
-<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
-<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project »">
+<!ENTITY aboutTor.footer.label "The Tor Project irabazi asmorik gabeko US 501(c)(3) bat da, ikerketara, garapenera, eta onlineko anonimotasuna eta pribatutasunaren hezkuntzara zuzendutakoa.">
+<!ENTITY aboutTor.learnMore.label "The Tor Projecti buruz gehiago ikasi »">
<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en">
1
0

[torbutton/master] Bug #10398: Do not create untranslatable strings.
by mikeperry@torproject.org 30 Mar '14
by mikeperry@torproject.org 30 Mar '14
30 Mar '14
commit 54c8721acf3c52855405c669ebfbdbeead69806a
Author: Kathy Brade <brade(a)pearlcrescent.com>
Date: Thu Jan 23 15:54:38 2014 -0500
Bug #10398: Do not create untranslatable strings.
Our use of entities that contained trailing spaces was a bad idea: they
got lost during the translation process. Instead, we now use a template
that contains a snippet of HTML, with the search engine URLs as separate
property strings.
We did our best to preserve the existing translated strings, converting
them to the new scheme and adding the missing spaces.
---
src/chrome/content/aboutTor/aboutTor.xhtml | 26 ++++++++++++++++++++++++--
src/chrome/locale/af/aboutTor.dtd | 19 +------------------
src/chrome/locale/af/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/ak/aboutTor.dtd | 19 +------------------
src/chrome/locale/ak/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/am/aboutTor.dtd | 19 +------------------
src/chrome/locale/am/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/ar/aboutTor.dtd | 27 +--------------------------
src/chrome/locale/ar/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/arn/aboutTor.dtd | 19 +------------------
src/chrome/locale/arn/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/ast/aboutTor.dtd | 19 +------------------
src/chrome/locale/ast/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/az/aboutTor.dtd | 19 +------------------
src/chrome/locale/az/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/be/aboutTor.dtd | 19 +------------------
src/chrome/locale/be/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/bg/aboutTor.dtd | 19 +------------------
src/chrome/locale/bg/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/bms/aboutTor.dtd | 19 +------------------
src/chrome/locale/bms/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/bn-IN/aboutTor.dtd | 19 +------------------
src/chrome/locale/bn-IN/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/bn/aboutTor.dtd | 19 +------------------
src/chrome/locale/bn/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/bo/aboutTor.dtd | 19 +------------------
src/chrome/locale/bo/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/br/aboutTor.dtd | 19 +------------------
src/chrome/locale/br/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/bs/aboutTor.dtd | 19 +------------------
src/chrome/locale/bs/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/ca/aboutTor.dtd | 19 +------------------
src/chrome/locale/ca/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/cs/aboutTor.dtd | 19 +------------------
src/chrome/locale/cs/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/csb/aboutTor.dtd | 19 +------------------
src/chrome/locale/csb/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/cy/aboutTor.dtd | 19 +------------------
src/chrome/locale/cy/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/da/aboutTor.dtd | 19 +------------------
src/chrome/locale/da/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/de/aboutTor.dtd | 27 +--------------------------
src/chrome/locale/de/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/dz/aboutTor.dtd | 19 +------------------
src/chrome/locale/dz/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/el/aboutTor.dtd | 19 +------------------
src/chrome/locale/el/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/en/aboutTor.dtd | 27 +--------------------------
src/chrome/locale/en/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/eo/aboutTor.dtd | 19 +------------------
src/chrome/locale/eo/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/es/aboutTor.dtd | 27 +--------------------------
src/chrome/locale/es/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/et/aboutTor.dtd | 19 +------------------
src/chrome/locale/et/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/eu/aboutTor.dtd | 19 +------------------
src/chrome/locale/eu/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/fa/aboutTor.dtd | 27 +--------------------------
src/chrome/locale/fa/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/fi/aboutTor.dtd | 19 +------------------
src/chrome/locale/fi/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/fil/aboutTor.dtd | 19 +------------------
src/chrome/locale/fil/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/fo/aboutTor.dtd | 19 +------------------
src/chrome/locale/fo/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/fr/aboutTor.dtd | 27 +--------------------------
src/chrome/locale/fr/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/fur/aboutTor.dtd | 19 +------------------
src/chrome/locale/fur/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/fy/aboutTor.dtd | 19 +------------------
src/chrome/locale/fy/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/ga/aboutTor.dtd | 19 +------------------
src/chrome/locale/ga/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/gl/aboutTor.dtd | 19 +------------------
src/chrome/locale/gl/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/gu/aboutTor.dtd | 19 +------------------
src/chrome/locale/gu/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/gun/aboutTor.dtd | 19 +------------------
src/chrome/locale/gun/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/ha/aboutTor.dtd | 19 +------------------
src/chrome/locale/ha/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/he/aboutTor.dtd | 19 +------------------
src/chrome/locale/he/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/hi/aboutTor.dtd | 19 +------------------
src/chrome/locale/hi/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/hr/aboutTor.dtd | 19 +------------------
src/chrome/locale/hr/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/ht/aboutTor.dtd | 19 +------------------
src/chrome/locale/ht/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/hu/aboutTor.dtd | 19 +------------------
src/chrome/locale/hu/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/hy/aboutTor.dtd | 19 +------------------
src/chrome/locale/hy/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/id/aboutTor.dtd | 19 +------------------
src/chrome/locale/id/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/is/aboutTor.dtd | 19 +------------------
src/chrome/locale/is/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/it/aboutTor.dtd | 27 +--------------------------
src/chrome/locale/it/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/ja/aboutTor.dtd | 27 +--------------------------
src/chrome/locale/ja/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/jv/aboutTor.dtd | 19 +------------------
src/chrome/locale/jv/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/ka/aboutTor.dtd | 19 +------------------
src/chrome/locale/ka/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/km/aboutTor.dtd | 19 +------------------
src/chrome/locale/km/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/kn/aboutTor.dtd | 19 +------------------
src/chrome/locale/kn/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/ko/aboutTor.dtd | 27 +--------------------------
src/chrome/locale/ko/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/ku/aboutTor.dtd | 19 +------------------
src/chrome/locale/ku/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/kw/aboutTor.dtd | 19 +------------------
src/chrome/locale/kw/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/ky/aboutTor.dtd | 19 +------------------
src/chrome/locale/ky/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/lb/aboutTor.dtd | 19 +------------------
src/chrome/locale/lb/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/lg/aboutTor.dtd | 19 +------------------
src/chrome/locale/lg/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/ln/aboutTor.dtd | 19 +------------------
src/chrome/locale/ln/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/lo/aboutTor.dtd | 19 +------------------
src/chrome/locale/lo/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/lt/aboutTor.dtd | 19 +------------------
src/chrome/locale/lt/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/lv/aboutTor.dtd | 19 +------------------
src/chrome/locale/lv/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/mg/aboutTor.dtd | 19 +------------------
src/chrome/locale/mg/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/mi/aboutTor.dtd | 19 +------------------
src/chrome/locale/mi/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/mk/aboutTor.dtd | 19 +------------------
src/chrome/locale/mk/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/ml/aboutTor.dtd | 19 +------------------
src/chrome/locale/ml/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/mn/aboutTor.dtd | 19 +------------------
src/chrome/locale/mn/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/mr/aboutTor.dtd | 19 +------------------
src/chrome/locale/mr/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/ms/aboutTor.dtd | 19 +------------------
src/chrome/locale/ms/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/mt/aboutTor.dtd | 19 +------------------
src/chrome/locale/mt/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/my/aboutTor.dtd | 19 +------------------
src/chrome/locale/my/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/nah/aboutTor.dtd | 19 +------------------
src/chrome/locale/nah/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/nap/aboutTor.dtd | 19 +------------------
src/chrome/locale/nap/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/nb/aboutTor.dtd | 19 +------------------
src/chrome/locale/nb/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/ne/aboutTor.dtd | 19 +------------------
src/chrome/locale/ne/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/nl/aboutTor.dtd | 27 +--------------------------
src/chrome/locale/nl/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/nn/aboutTor.dtd | 19 +------------------
src/chrome/locale/nn/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/nso/aboutTor.dtd | 19 +------------------
src/chrome/locale/nso/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/oc/aboutTor.dtd | 19 +------------------
src/chrome/locale/oc/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/or/aboutTor.dtd | 19 +------------------
src/chrome/locale/or/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/pa/aboutTor.dtd | 19 +------------------
src/chrome/locale/pa/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/pap/aboutTor.dtd | 19 +------------------
src/chrome/locale/pap/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/pl/aboutTor.dtd | 27 +--------------------------
src/chrome/locale/pl/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/pms/aboutTor.dtd | 19 +------------------
src/chrome/locale/pms/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/ps/aboutTor.dtd | 19 +------------------
src/chrome/locale/ps/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/pt-BR/aboutTor.dtd | 19 +------------------
src/chrome/locale/pt-BR/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/pt/aboutTor.dtd | 27 +--------------------------
src/chrome/locale/pt/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/ro/aboutTor.dtd | 19 +------------------
src/chrome/locale/ro/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/ru/aboutTor.dtd | 27 +--------------------------
src/chrome/locale/ru/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/sco/aboutTor.dtd | 19 +------------------
src/chrome/locale/sco/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/sk/aboutTor.dtd | 19 +------------------
src/chrome/locale/sk/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/sl/aboutTor.dtd | 19 +------------------
src/chrome/locale/sl/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/so/aboutTor.dtd | 19 +------------------
src/chrome/locale/so/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/son/aboutTor.dtd | 19 +------------------
src/chrome/locale/son/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/sq/aboutTor.dtd | 19 +------------------
src/chrome/locale/sq/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/sr/aboutTor.dtd | 19 +------------------
src/chrome/locale/sr/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/st/aboutTor.dtd | 19 +------------------
src/chrome/locale/st/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/su/aboutTor.dtd | 19 +------------------
src/chrome/locale/su/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/sv/aboutTor.dtd | 19 +------------------
src/chrome/locale/sv/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/sw/aboutTor.dtd | 19 +------------------
src/chrome/locale/sw/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/ta/aboutTor.dtd | 19 +------------------
src/chrome/locale/ta/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/te/aboutTor.dtd | 19 +------------------
src/chrome/locale/te/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/tg/aboutTor.dtd | 19 +------------------
src/chrome/locale/tg/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/th/aboutTor.dtd | 19 +------------------
src/chrome/locale/th/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/ti/aboutTor.dtd | 19 +------------------
src/chrome/locale/ti/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/tk/aboutTor.dtd | 19 +------------------
src/chrome/locale/tk/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/tr/aboutTor.dtd | 19 +------------------
src/chrome/locale/tr/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/uk/aboutTor.dtd | 19 +------------------
src/chrome/locale/uk/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/ur/aboutTor.dtd | 19 +------------------
src/chrome/locale/ur/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/ve/aboutTor.dtd | 19 +------------------
src/chrome/locale/ve/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/vi/aboutTor.dtd | 27 +--------------------------
src/chrome/locale/vi/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/wa/aboutTor.dtd | 19 +------------------
src/chrome/locale/wa/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/wo/aboutTor.dtd | 19 +------------------
src/chrome/locale/wo/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/zh-CN/aboutTor.dtd | 27 +--------------------------
src/chrome/locale/zh-CN/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/zh-HK/aboutTor.dtd | 19 +------------------
src/chrome/locale/zh-HK/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/zh-TW/aboutTor.dtd | 19 +------------------
src/chrome/locale/zh-TW/aboutTor.properties | 15 +++++++++++++++
src/chrome/locale/zu/aboutTor.dtd | 19 +------------------
src/chrome/locale/zu/aboutTor.properties | 15 +++++++++++++++
239 files changed, 1928 insertions(+), 2264 deletions(-)
diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml
index ce06941..02e0c7c 100644
--- a/src/chrome/content/aboutTor/aboutTor.xhtml
+++ b/src/chrome/content/aboutTor/aboutTor.xhtml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -25,6 +25,8 @@
<![CDATA[
function onLoad()
{
+ insertPropertyStrings();
+
window.addEventListener("resize", function() {
resizeToolbarIconArrow();
}, false);
@@ -45,6 +47,26 @@ function resizeToolbarIconArrow()
rightDiv.style.width = width + "px";
}
}
+
+function insertPropertyStrings()
+{
+ try {
+ var kPropertiesURL = "chrome://torbutton/locale/aboutTor.properties";
+
+ Components.utils.import("resource://gre/modules/Services.jsm");
+ var gStringBundle = Services.strings.createBundle(kPropertiesURL);
+ var s1 = gStringBundle.GetStringFromName("aboutTor.searchSP.privacy.link");
+ var s2 = gStringBundle.GetStringFromName("aboutTor.searchSP.search.link");
+ var result = gStringBundle.formatStringFromName("aboutTor.searchSP.privacy",
+ [s1, s2], 2);
+ if (result) {
+ var elem = document.getElementById("searchProviderInfo");
+ if (elem)
+ elem.innerHTML = result;
+ }
+ } catch(e) {};
+}
+
]]>
</script>
</head>
@@ -84,7 +106,7 @@ function resizeToolbarIconArrow()
</div>
<input name="q" autocomplete="off" id="sx" type="text"/>
</div>
- <h4>&aboutTor.searchSP.privacy.beforeLink.label;<a href="&aboutTor.searchSP.privacy.link;">&aboutTor.searchSP.privacy.label;</a>&aboutTor.searchSP.privacy.afterLink.label;&aboutTor.searchSP.search.beforeLink.label;<a href="&aboutTor.searchSP.search.link;">&aboutTor.searchSP.search.label;</a>&aboutTor.searchSP.search.afterLink.label;</h4>
+ <h4 id="searchProviderInfo" />
</form>
</div>
diff --git a/src/chrome/locale/af/aboutTor.dtd b/src/chrome/locale/af/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/af/aboutTor.dtd
+++ b/src/chrome/locale/af/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/af/aboutTor.properties b/src/chrome/locale/af/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/af/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/ak/aboutTor.dtd b/src/chrome/locale/ak/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/ak/aboutTor.dtd
+++ b/src/chrome/locale/ak/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/ak/aboutTor.properties b/src/chrome/locale/ak/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/ak/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/am/aboutTor.dtd b/src/chrome/locale/am/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/am/aboutTor.dtd
+++ b/src/chrome/locale/am/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/am/aboutTor.properties b/src/chrome/locale/am/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/am/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/ar/aboutTor.dtd b/src/chrome/locale/ar/aboutTor.dtd
index 8b0d7cf..e02388f 100644
--- a/src/chrome/locale/ar/aboutTor.dtd
+++ b/src/chrome/locale/ar/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -23,33 +23,8 @@
<!ENTITY aboutTor.search.label "بحث">
-<!-- Note to translators: the following 18 entities are used to construct a
- - sentence (either the SP or DDG entities are used, but not both at the
- - same time). In English, the sentence reads:
- - Search securely with Startpage.
- - or:
- - Search securely with DuckDuckGo.
- - The sentence contains two embedded links for "securely" and
- - the search engine ("Startpage" or "DuckDuckGo").
- -->
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "بحث">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "بحث">
-<!ENTITY aboutTor.searchSP.privacy.label "بآمان">
-<!ENTITY aboutTor.searchDDG.privacy.label "بآمان">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "مع">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "مع">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "معلومات إضافية:">
<!ENTITY aboutTor.torInfo2.label "الدولة وعنوان الإنترنت:">
diff --git a/src/chrome/locale/ar/aboutTor.properties b/src/chrome/locale/ar/aboutTor.properties
new file mode 100644
index 0000000..09f1f91
--- /dev/null
+++ b/src/chrome/locale/ar/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=بحث <a href="%1$S">بآمان</a> مع <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=بحث <a href="%1$S">بآمان</a> مع <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/arn/aboutTor.dtd b/src/chrome/locale/arn/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/arn/aboutTor.dtd
+++ b/src/chrome/locale/arn/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/arn/aboutTor.properties b/src/chrome/locale/arn/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/arn/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/ast/aboutTor.dtd b/src/chrome/locale/ast/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/ast/aboutTor.dtd
+++ b/src/chrome/locale/ast/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/ast/aboutTor.properties b/src/chrome/locale/ast/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/ast/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/az/aboutTor.dtd b/src/chrome/locale/az/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/az/aboutTor.dtd
+++ b/src/chrome/locale/az/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/az/aboutTor.properties b/src/chrome/locale/az/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/az/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/be/aboutTor.dtd b/src/chrome/locale/be/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/be/aboutTor.dtd
+++ b/src/chrome/locale/be/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/be/aboutTor.properties b/src/chrome/locale/be/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/be/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/bg/aboutTor.dtd b/src/chrome/locale/bg/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/bg/aboutTor.dtd
+++ b/src/chrome/locale/bg/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/bg/aboutTor.properties b/src/chrome/locale/bg/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/bg/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/bms/aboutTor.dtd b/src/chrome/locale/bms/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/bms/aboutTor.dtd
+++ b/src/chrome/locale/bms/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/bms/aboutTor.properties b/src/chrome/locale/bms/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/bms/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/bn-IN/aboutTor.dtd b/src/chrome/locale/bn-IN/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/bn-IN/aboutTor.dtd
+++ b/src/chrome/locale/bn-IN/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/bn-IN/aboutTor.properties b/src/chrome/locale/bn-IN/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/bn-IN/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/bn/aboutTor.dtd b/src/chrome/locale/bn/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/bn/aboutTor.dtd
+++ b/src/chrome/locale/bn/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/bn/aboutTor.properties b/src/chrome/locale/bn/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/bn/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/bo/aboutTor.dtd b/src/chrome/locale/bo/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/bo/aboutTor.dtd
+++ b/src/chrome/locale/bo/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/bo/aboutTor.properties b/src/chrome/locale/bo/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/bo/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/br/aboutTor.dtd b/src/chrome/locale/br/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/br/aboutTor.dtd
+++ b/src/chrome/locale/br/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/br/aboutTor.properties b/src/chrome/locale/br/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/br/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/bs/aboutTor.dtd b/src/chrome/locale/bs/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/bs/aboutTor.dtd
+++ b/src/chrome/locale/bs/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/bs/aboutTor.properties b/src/chrome/locale/bs/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/bs/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/ca/aboutTor.dtd b/src/chrome/locale/ca/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/ca/aboutTor.dtd
+++ b/src/chrome/locale/ca/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/ca/aboutTor.properties b/src/chrome/locale/ca/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/ca/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/cs/aboutTor.dtd b/src/chrome/locale/cs/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/cs/aboutTor.dtd
+++ b/src/chrome/locale/cs/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/cs/aboutTor.properties b/src/chrome/locale/cs/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/cs/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/csb/aboutTor.dtd b/src/chrome/locale/csb/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/csb/aboutTor.dtd
+++ b/src/chrome/locale/csb/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/csb/aboutTor.properties b/src/chrome/locale/csb/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/csb/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/cy/aboutTor.dtd b/src/chrome/locale/cy/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/cy/aboutTor.dtd
+++ b/src/chrome/locale/cy/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/cy/aboutTor.properties b/src/chrome/locale/cy/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/cy/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/da/aboutTor.dtd b/src/chrome/locale/da/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/da/aboutTor.dtd
+++ b/src/chrome/locale/da/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/da/aboutTor.properties b/src/chrome/locale/da/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/da/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/de/aboutTor.dtd b/src/chrome/locale/de/aboutTor.dtd
index de478a2..7948f5f 100644
--- a/src/chrome/locale/de/aboutTor.dtd
+++ b/src/chrome/locale/de/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -23,33 +23,8 @@
<!ENTITY aboutTor.search.label "Suchen">
-<!-- Note to translators: the following 18 entities are used to construct a
- - sentence (either the SP or DDG entities are used, but not both at the
- - same time). In English, the sentence reads:
- - Search securely with Startpage.
- - or:
- - Search securely with DuckDuckGo.
- - The sentence contains two embedded links for "securely" and
- - the search engine ("Startpage" or "DuckDuckGo").
- -->
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Suche">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Suche">
-<!ENTITY aboutTor.searchSP.privacy.label "sicher">
-<!ENTITY aboutTor.searchDDG.privacy.label "sicher">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/deu/protect-privacy.html">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "mit">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "mit">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Zusätzliche Informationen:">
<!ENTITY aboutTor.torInfo2.label "Land & IP-Adresse:">
diff --git a/src/chrome/locale/de/aboutTor.properties b/src/chrome/locale/de/aboutTor.properties
new file mode 100644
index 0000000..55f555d
--- /dev/null
+++ b/src/chrome/locale/de/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Suche <a href="%1$S">sicher</a> mit <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/deu/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Suche <a href="%1$S">sicher</a> mit <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/dz/aboutTor.dtd b/src/chrome/locale/dz/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/dz/aboutTor.dtd
+++ b/src/chrome/locale/dz/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/dz/aboutTor.properties b/src/chrome/locale/dz/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/dz/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/el/aboutTor.dtd b/src/chrome/locale/el/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/el/aboutTor.dtd
+++ b/src/chrome/locale/el/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/el/aboutTor.properties b/src/chrome/locale/el/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/el/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/en/aboutTor.dtd b/src/chrome/locale/en/aboutTor.dtd
index 89a01a2..7128bb8 100644
--- a/src/chrome/locale/en/aboutTor.dtd
+++ b/src/chrome/locale/en/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -23,33 +23,8 @@
<!ENTITY aboutTor.search.label "Search">
-<!-- Note to translators: the following 18 entities are used to construct a
- - sentence (either the SP or DDG entities are used, but not both at the
- - same time). In English, the sentence reads:
- - Search securely with Startpage.
- - or:
- - Search securely with DuckDuckGo.
- - The sentence contains two embedded links for "securely" and
- - the search engine ("Startpage" or "DuckDuckGo").
- -->
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label " ">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label " ">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/en/aboutTor.properties b/src/chrome/locale/en/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/en/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/eo/aboutTor.dtd b/src/chrome/locale/eo/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/eo/aboutTor.dtd
+++ b/src/chrome/locale/eo/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/eo/aboutTor.properties b/src/chrome/locale/eo/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/eo/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/es/aboutTor.dtd b/src/chrome/locale/es/aboutTor.dtd
index 57f24f7..af9ff47 100644
--- a/src/chrome/locale/es/aboutTor.dtd
+++ b/src/chrome/locale/es/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -23,33 +23,8 @@
<!ENTITY aboutTor.search.label "Buscar">
-<!-- Note to translators: the following 18 entities are used to construct a
- - sentence (either the SP or DDG entities are used, but not both at the
- - same time). In English, the sentence reads:
- - Search securely with Startpage.
- - or:
- - Search securely with DuckDuckGo.
- - The sentence contains two embedded links for "securely" and
- - the search engine ("Startpage" or "DuckDuckGo").
- -->
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Busque">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Busque">
-<!ENTITY aboutTor.searchSP.privacy.label "con seguridad">
-<!ENTITY aboutTor.searchDDG.privacy.label "con seguridad">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/esp/protect-privacy.html">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "con">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "con">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/esp">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Información adicional:">
<!ENTITY aboutTor.torInfo2.label "País y dirección IP:">
diff --git a/src/chrome/locale/es/aboutTor.properties b/src/chrome/locale/es/aboutTor.properties
new file mode 100644
index 0000000..f8bdb1d
--- /dev/null
+++ b/src/chrome/locale/es/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Busque <a href="%1$S">con seguridad</a> con <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/esp/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/esp
+
+aboutTor.searchDDG.privacy=Busque <a href="%1$S">con seguridad</a> con <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/et/aboutTor.dtd b/src/chrome/locale/et/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/et/aboutTor.dtd
+++ b/src/chrome/locale/et/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/et/aboutTor.properties b/src/chrome/locale/et/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/et/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/eu/aboutTor.dtd b/src/chrome/locale/eu/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/eu/aboutTor.dtd
+++ b/src/chrome/locale/eu/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/eu/aboutTor.properties b/src/chrome/locale/eu/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/eu/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/fa/aboutTor.dtd b/src/chrome/locale/fa/aboutTor.dtd
index 08bf75c..fa8e9ae 100644
--- a/src/chrome/locale/fa/aboutTor.dtd
+++ b/src/chrome/locale/fa/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -23,33 +23,8 @@
<!ENTITY aboutTor.search.label "جستجو">
-<!-- Note to translators: the following 18 entities are used to construct a
- - sentence (either the SP or DDG entities are used, but not both at the
- - same time). In English, the sentence reads:
- - Search securely with Startpage.
- - or:
- - Search securely with DuckDuckGo.
- - The sentence contains two embedded links for "securely" and
- - the search engine ("Startpage" or "DuckDuckGo").
- -->
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "جستجو">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "جستجو">
-<!ENTITY aboutTor.searchSP.privacy.label "بصورت امن">
-<!ENTITY aboutTor.searchDDG.privacy.label "بصورت امن">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "اطلاعات بيشتر">
<!ENTITY aboutTor.torInfo2.label "كشور و آدرس آى پی:">
diff --git a/src/chrome/locale/fa/aboutTor.properties b/src/chrome/locale/fa/aboutTor.properties
new file mode 100644
index 0000000..3c1c06c
--- /dev/null
+++ b/src/chrome/locale/fa/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=جستجو <a href="%1$S">بصورت امن</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=جستجو <a href="%1$S">بصورت امن</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/fi/aboutTor.dtd b/src/chrome/locale/fi/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/fi/aboutTor.dtd
+++ b/src/chrome/locale/fi/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/fi/aboutTor.properties b/src/chrome/locale/fi/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/fi/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/fil/aboutTor.dtd b/src/chrome/locale/fil/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/fil/aboutTor.dtd
+++ b/src/chrome/locale/fil/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/fil/aboutTor.properties b/src/chrome/locale/fil/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/fil/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/fo/aboutTor.dtd b/src/chrome/locale/fo/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/fo/aboutTor.dtd
+++ b/src/chrome/locale/fo/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/fo/aboutTor.properties b/src/chrome/locale/fo/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/fo/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/fr/aboutTor.dtd b/src/chrome/locale/fr/aboutTor.dtd
index a0b041b..41ad3e5 100644
--- a/src/chrome/locale/fr/aboutTor.dtd
+++ b/src/chrome/locale/fr/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -23,33 +23,8 @@
<!ENTITY aboutTor.search.label "Rechercher">
-<!-- Note to translators: the following 18 entities are used to construct a
- - sentence (either the SP or DDG entities are used, but not both at the
- - same time). In English, the sentence reads:
- - Search securely with Startpage.
- - or:
- - Search securely with DuckDuckGo.
- - The sentence contains two embedded links for "securely" and
- - the search engine ("Startpage" or "DuckDuckGo").
- -->
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Rechercher ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Rechercher ">
-<!ENTITY aboutTor.searchSP.privacy.label "en toute sécurité">
-<!ENTITY aboutTor.searchDDG.privacy.label "en toute sécurité">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "avec ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "avec ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Informations supplémentaires :">
<!ENTITY aboutTor.torInfo2.label "Pays & adresse IP :">
diff --git a/src/chrome/locale/fr/aboutTor.properties b/src/chrome/locale/fr/aboutTor.properties
new file mode 100644
index 0000000..5bd5049
--- /dev/null
+++ b/src/chrome/locale/fr/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Rechercher <a href="%1$S">en toute sécurité</a> avec <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Rechercher <a href="%1$S">en toute sécurité</a> avec <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/fur/aboutTor.dtd b/src/chrome/locale/fur/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/fur/aboutTor.dtd
+++ b/src/chrome/locale/fur/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/fur/aboutTor.properties b/src/chrome/locale/fur/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/fur/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/fy/aboutTor.dtd b/src/chrome/locale/fy/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/fy/aboutTor.dtd
+++ b/src/chrome/locale/fy/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/fy/aboutTor.properties b/src/chrome/locale/fy/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/fy/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/ga/aboutTor.dtd b/src/chrome/locale/ga/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/ga/aboutTor.dtd
+++ b/src/chrome/locale/ga/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/ga/aboutTor.properties b/src/chrome/locale/ga/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/ga/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/gl/aboutTor.dtd b/src/chrome/locale/gl/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/gl/aboutTor.dtd
+++ b/src/chrome/locale/gl/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/gl/aboutTor.properties b/src/chrome/locale/gl/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/gl/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/gu/aboutTor.dtd b/src/chrome/locale/gu/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/gu/aboutTor.dtd
+++ b/src/chrome/locale/gu/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/gu/aboutTor.properties b/src/chrome/locale/gu/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/gu/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/gun/aboutTor.dtd b/src/chrome/locale/gun/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/gun/aboutTor.dtd
+++ b/src/chrome/locale/gun/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/gun/aboutTor.properties b/src/chrome/locale/gun/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/gun/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/ha/aboutTor.dtd b/src/chrome/locale/ha/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/ha/aboutTor.dtd
+++ b/src/chrome/locale/ha/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/ha/aboutTor.properties b/src/chrome/locale/ha/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/ha/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/he/aboutTor.dtd b/src/chrome/locale/he/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/he/aboutTor.dtd
+++ b/src/chrome/locale/he/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/he/aboutTor.properties b/src/chrome/locale/he/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/he/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/hi/aboutTor.dtd b/src/chrome/locale/hi/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/hi/aboutTor.dtd
+++ b/src/chrome/locale/hi/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/hi/aboutTor.properties b/src/chrome/locale/hi/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/hi/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/hr/aboutTor.dtd b/src/chrome/locale/hr/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/hr/aboutTor.dtd
+++ b/src/chrome/locale/hr/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/hr/aboutTor.properties b/src/chrome/locale/hr/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/hr/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/ht/aboutTor.dtd b/src/chrome/locale/ht/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/ht/aboutTor.dtd
+++ b/src/chrome/locale/ht/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/ht/aboutTor.properties b/src/chrome/locale/ht/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/ht/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/hu/aboutTor.dtd b/src/chrome/locale/hu/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/hu/aboutTor.dtd
+++ b/src/chrome/locale/hu/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/hu/aboutTor.properties b/src/chrome/locale/hu/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/hu/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/hy/aboutTor.dtd b/src/chrome/locale/hy/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/hy/aboutTor.dtd
+++ b/src/chrome/locale/hy/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/hy/aboutTor.properties b/src/chrome/locale/hy/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/hy/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/id/aboutTor.dtd b/src/chrome/locale/id/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/id/aboutTor.dtd
+++ b/src/chrome/locale/id/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/id/aboutTor.properties b/src/chrome/locale/id/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/id/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/is/aboutTor.dtd b/src/chrome/locale/is/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/is/aboutTor.dtd
+++ b/src/chrome/locale/is/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/is/aboutTor.properties b/src/chrome/locale/is/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/is/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/it/aboutTor.dtd b/src/chrome/locale/it/aboutTor.dtd
index 57b1a42..151a7d5 100644
--- a/src/chrome/locale/it/aboutTor.dtd
+++ b/src/chrome/locale/it/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -23,33 +23,8 @@
<!ENTITY aboutTor.search.label "Cerca">
-<!-- Note to translators: the following 18 entities are used to construct a
- - sentence (either the SP or DDG entities are used, but not both at the
- - same time). In English, the sentence reads:
- - Search securely with Startpage.
- - or:
- - Search securely with DuckDuckGo.
- - The sentence contains two embedded links for "securely" and
- - the search engine ("Startpage" or "DuckDuckGo").
- -->
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Cerca">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Cerca">
-<!ENTITY aboutTor.searchSP.privacy.label "in modo sicuro">
-<!ENTITY aboutTor.searchDDG.privacy.label "in modo sicuro">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/ita/protect-privacy.html">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "con">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "con">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Ulteriori Info:">
<!ENTITY aboutTor.torInfo2.label "Nazione & Indirizzo IP:">
diff --git a/src/chrome/locale/it/aboutTor.properties b/src/chrome/locale/it/aboutTor.properties
new file mode 100644
index 0000000..0748189
--- /dev/null
+++ b/src/chrome/locale/it/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Cerca <a href="%1$S">in modo sicuro</a> con <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/ita/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Cerca <a href="%1$S">in modo sicuro</a> con <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/ja/aboutTor.dtd b/src/chrome/locale/ja/aboutTor.dtd
index 1f96caf..4d27e73 100644
--- a/src/chrome/locale/ja/aboutTor.dtd
+++ b/src/chrome/locale/ja/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -23,33 +23,8 @@
<!ENTITY aboutTor.search.label "検索">
-<!-- Note to translators: the following 18 entities are used to construct a
- - sentence (either the SP or DDG entities are used, but not both at the
- - same time). In English, the sentence reads:
- - Search securely with Startpage.
- - or:
- - Search securely with DuckDuckGo.
- - The sentence contains two embedded links for "securely" and
- - the search engine ("Startpage" or "DuckDuckGo").
- -->
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "検索">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "検索">
-<!ENTITY aboutTor.searchSP.privacy.label "安全に">
-<!ENTITY aboutTor.searchDDG.privacy.label "安全に">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "一緒に">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "一緒に">
-<!ENTITY aboutTor.searchSP.search.label "スタートページ">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "追加情報: ">
<!ENTITY aboutTor.torInfo2.label "国とIPアドレス:">
diff --git a/src/chrome/locale/ja/aboutTor.properties b/src/chrome/locale/ja/aboutTor.properties
new file mode 100644
index 0000000..591c9ca
--- /dev/null
+++ b/src/chrome/locale/ja/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=検索 <a href="%1$S">安全に</a> 一緒に <a href="%2$S">スタートページ</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=検索 <a href="%1$S">安全に</a> 一緒に <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/jv/aboutTor.dtd b/src/chrome/locale/jv/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/jv/aboutTor.dtd
+++ b/src/chrome/locale/jv/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/jv/aboutTor.properties b/src/chrome/locale/jv/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/jv/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/ka/aboutTor.dtd b/src/chrome/locale/ka/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/ka/aboutTor.dtd
+++ b/src/chrome/locale/ka/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/ka/aboutTor.properties b/src/chrome/locale/ka/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/ka/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/km/aboutTor.dtd b/src/chrome/locale/km/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/km/aboutTor.dtd
+++ b/src/chrome/locale/km/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/km/aboutTor.properties b/src/chrome/locale/km/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/km/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/kn/aboutTor.dtd b/src/chrome/locale/kn/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/kn/aboutTor.dtd
+++ b/src/chrome/locale/kn/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/kn/aboutTor.properties b/src/chrome/locale/kn/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/kn/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/ko/aboutTor.dtd b/src/chrome/locale/ko/aboutTor.dtd
index 008a804..d388ca4 100644
--- a/src/chrome/locale/ko/aboutTor.dtd
+++ b/src/chrome/locale/ko/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -23,33 +23,8 @@
<!ENTITY aboutTor.search.label "검색">
-<!-- Note to translators: the following 18 entities are used to construct a
- - sentence (either the SP or DDG entities are used, but not both at the
- - same time). In English, the sentence reads:
- - Search securely with Startpage.
- - or:
- - Search securely with DuckDuckGo.
- - The sentence contains two embedded links for "securely" and
- - the search engine ("Startpage" or "DuckDuckGo").
- -->
<!ENTITY aboutTor.searchSPPost.link "">
<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label " ">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label " ">
<!ENTITY aboutTor.torInfo1.label "">
<!ENTITY aboutTor.torInfo2.label "">
diff --git a/src/chrome/locale/ko/aboutTor.properties b/src/chrome/locale/ko/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/ko/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/ku/aboutTor.dtd b/src/chrome/locale/ku/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/ku/aboutTor.dtd
+++ b/src/chrome/locale/ku/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/ku/aboutTor.properties b/src/chrome/locale/ku/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/ku/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/kw/aboutTor.dtd b/src/chrome/locale/kw/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/kw/aboutTor.dtd
+++ b/src/chrome/locale/kw/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/kw/aboutTor.properties b/src/chrome/locale/kw/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/kw/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/ky/aboutTor.dtd b/src/chrome/locale/ky/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/ky/aboutTor.dtd
+++ b/src/chrome/locale/ky/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/ky/aboutTor.properties b/src/chrome/locale/ky/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/ky/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/lb/aboutTor.dtd b/src/chrome/locale/lb/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/lb/aboutTor.dtd
+++ b/src/chrome/locale/lb/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/lb/aboutTor.properties b/src/chrome/locale/lb/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/lb/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/lg/aboutTor.dtd b/src/chrome/locale/lg/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/lg/aboutTor.dtd
+++ b/src/chrome/locale/lg/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/lg/aboutTor.properties b/src/chrome/locale/lg/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/lg/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/ln/aboutTor.dtd b/src/chrome/locale/ln/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/ln/aboutTor.dtd
+++ b/src/chrome/locale/ln/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/ln/aboutTor.properties b/src/chrome/locale/ln/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/ln/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/lo/aboutTor.dtd b/src/chrome/locale/lo/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/lo/aboutTor.dtd
+++ b/src/chrome/locale/lo/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/lo/aboutTor.properties b/src/chrome/locale/lo/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/lo/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/lt/aboutTor.dtd b/src/chrome/locale/lt/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/lt/aboutTor.dtd
+++ b/src/chrome/locale/lt/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/lt/aboutTor.properties b/src/chrome/locale/lt/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/lt/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/lv/aboutTor.dtd b/src/chrome/locale/lv/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/lv/aboutTor.dtd
+++ b/src/chrome/locale/lv/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/lv/aboutTor.properties b/src/chrome/locale/lv/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/lv/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/mg/aboutTor.dtd b/src/chrome/locale/mg/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/mg/aboutTor.dtd
+++ b/src/chrome/locale/mg/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/mg/aboutTor.properties b/src/chrome/locale/mg/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/mg/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/mi/aboutTor.dtd b/src/chrome/locale/mi/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/mi/aboutTor.dtd
+++ b/src/chrome/locale/mi/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/mi/aboutTor.properties b/src/chrome/locale/mi/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/mi/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/mk/aboutTor.dtd b/src/chrome/locale/mk/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/mk/aboutTor.dtd
+++ b/src/chrome/locale/mk/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/mk/aboutTor.properties b/src/chrome/locale/mk/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/mk/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/ml/aboutTor.dtd b/src/chrome/locale/ml/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/ml/aboutTor.dtd
+++ b/src/chrome/locale/ml/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/ml/aboutTor.properties b/src/chrome/locale/ml/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/ml/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/mn/aboutTor.dtd b/src/chrome/locale/mn/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/mn/aboutTor.dtd
+++ b/src/chrome/locale/mn/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/mn/aboutTor.properties b/src/chrome/locale/mn/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/mn/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/mr/aboutTor.dtd b/src/chrome/locale/mr/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/mr/aboutTor.dtd
+++ b/src/chrome/locale/mr/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/mr/aboutTor.properties b/src/chrome/locale/mr/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/mr/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/ms/aboutTor.dtd b/src/chrome/locale/ms/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/ms/aboutTor.dtd
+++ b/src/chrome/locale/ms/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/ms/aboutTor.properties b/src/chrome/locale/ms/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/ms/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/mt/aboutTor.dtd b/src/chrome/locale/mt/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/mt/aboutTor.dtd
+++ b/src/chrome/locale/mt/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/mt/aboutTor.properties b/src/chrome/locale/mt/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/mt/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/my/aboutTor.dtd b/src/chrome/locale/my/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/my/aboutTor.dtd
+++ b/src/chrome/locale/my/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/my/aboutTor.properties b/src/chrome/locale/my/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/my/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/nah/aboutTor.dtd b/src/chrome/locale/nah/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/nah/aboutTor.dtd
+++ b/src/chrome/locale/nah/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/nah/aboutTor.properties b/src/chrome/locale/nah/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/nah/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/nap/aboutTor.dtd b/src/chrome/locale/nap/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/nap/aboutTor.dtd
+++ b/src/chrome/locale/nap/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/nap/aboutTor.properties b/src/chrome/locale/nap/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/nap/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/nb/aboutTor.dtd b/src/chrome/locale/nb/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/nb/aboutTor.dtd
+++ b/src/chrome/locale/nb/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/nb/aboutTor.properties b/src/chrome/locale/nb/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/nb/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/ne/aboutTor.dtd b/src/chrome/locale/ne/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/ne/aboutTor.dtd
+++ b/src/chrome/locale/ne/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/ne/aboutTor.properties b/src/chrome/locale/ne/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/ne/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/nl/aboutTor.dtd b/src/chrome/locale/nl/aboutTor.dtd
index fd73f07..980ac35 100644
--- a/src/chrome/locale/nl/aboutTor.dtd
+++ b/src/chrome/locale/nl/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -23,33 +23,8 @@
<!ENTITY aboutTor.search.label "Zoeken">
-<!-- Note to translators: the following 18 entities are used to construct a
- - sentence (either the SP or DDG entities are used, but not both at the
- - same time). In English, the sentence reads:
- - Search securely with Startpage.
- - or:
- - Search securely with DuckDuckGo.
- - The sentence contains two embedded links for "securely" and
- - the search engine ("Startpage" or "DuckDuckGo").
- -->
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Zoeken">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Zoeken">
-<!ENTITY aboutTor.searchSP.privacy.label "veilig">
-<!ENTITY aboutTor.searchDDG.privacy.label "veilig">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/ned/protect-privacy.html">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "met">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "met">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "Startpage">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Bijkomende informatie:">
<!ENTITY aboutTor.torInfo2.label "Land & IP Adres:">
diff --git a/src/chrome/locale/nl/aboutTor.properties b/src/chrome/locale/nl/aboutTor.properties
new file mode 100644
index 0000000..e6d6650
--- /dev/null
+++ b/src/chrome/locale/nl/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Zoeken <a href="%1$S">veilig</a> met <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/ned/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Zoeken <a href="%1$S">veilig</a> met <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/nn/aboutTor.dtd b/src/chrome/locale/nn/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/nn/aboutTor.dtd
+++ b/src/chrome/locale/nn/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/nn/aboutTor.properties b/src/chrome/locale/nn/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/nn/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/nso/aboutTor.dtd b/src/chrome/locale/nso/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/nso/aboutTor.dtd
+++ b/src/chrome/locale/nso/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/nso/aboutTor.properties b/src/chrome/locale/nso/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/nso/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/oc/aboutTor.dtd b/src/chrome/locale/oc/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/oc/aboutTor.dtd
+++ b/src/chrome/locale/oc/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/oc/aboutTor.properties b/src/chrome/locale/oc/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/oc/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/or/aboutTor.dtd b/src/chrome/locale/or/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/or/aboutTor.dtd
+++ b/src/chrome/locale/or/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/or/aboutTor.properties b/src/chrome/locale/or/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/or/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/pa/aboutTor.dtd b/src/chrome/locale/pa/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/pa/aboutTor.dtd
+++ b/src/chrome/locale/pa/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/pa/aboutTor.properties b/src/chrome/locale/pa/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/pa/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/pap/aboutTor.dtd b/src/chrome/locale/pap/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/pap/aboutTor.dtd
+++ b/src/chrome/locale/pap/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/pap/aboutTor.properties b/src/chrome/locale/pap/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/pap/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/pl/aboutTor.dtd b/src/chrome/locale/pl/aboutTor.dtd
index 2ac4a75..a4813da 100644
--- a/src/chrome/locale/pl/aboutTor.dtd
+++ b/src/chrome/locale/pl/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -23,33 +23,8 @@
<!ENTITY aboutTor.search.label "Szukaj">
-<!-- Note to translators: the following 18 entities are used to construct a
- - sentence (either the SP or DDG entities are used, but not both at the
- - same time). In English, the sentence reads:
- - Search securely with Startpage.
- - or:
- - Search securely with DuckDuckGo.
- - The sentence contains two embedded links for "securely" and
- - the search engine ("Startpage" or "DuckDuckGo").
- -->
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Szukaj">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Szukaj">
-<!ENTITY aboutTor.searchSP.privacy.label "bezpiecznie">
-<!ENTITY aboutTor.searchDDG.privacy.label "bezpiecznie">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "z">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "z">
-<!ENTITY aboutTor.searchSP.search.label "Strona startowa">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Dodatkowe informacje:">
<!ENTITY aboutTor.torInfo2.label "Kraj i adres IP:">
diff --git a/src/chrome/locale/pl/aboutTor.properties b/src/chrome/locale/pl/aboutTor.properties
new file mode 100644
index 0000000..0bfea6f
--- /dev/null
+++ b/src/chrome/locale/pl/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Szukaj <a href="%1$S">bezpiecznie</a> z <a href="%2$S">Strona startowa</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Szukaj <a href="%1$S">bezpiecznie</a> z <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/pms/aboutTor.dtd b/src/chrome/locale/pms/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/pms/aboutTor.dtd
+++ b/src/chrome/locale/pms/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/pms/aboutTor.properties b/src/chrome/locale/pms/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/pms/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/ps/aboutTor.dtd b/src/chrome/locale/ps/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/ps/aboutTor.dtd
+++ b/src/chrome/locale/ps/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/ps/aboutTor.properties b/src/chrome/locale/ps/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/ps/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/pt-BR/aboutTor.dtd b/src/chrome/locale/pt-BR/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/pt-BR/aboutTor.dtd
+++ b/src/chrome/locale/pt-BR/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/pt-BR/aboutTor.properties b/src/chrome/locale/pt-BR/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/pt-BR/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/pt/aboutTor.dtd b/src/chrome/locale/pt/aboutTor.dtd
index 4cbd760..05e9d84 100644
--- a/src/chrome/locale/pt/aboutTor.dtd
+++ b/src/chrome/locale/pt/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -23,33 +23,8 @@
<!ENTITY aboutTor.search.label "Procurar">
-<!-- Note to translators: the following 18 entities are used to construct a
- - sentence (either the SP or DDG entities are used, but not both at the
- - same time). In English, the sentence reads:
- - Search securely with Startpage.
- - or:
- - Search securely with DuckDuckGo.
- - The sentence contains two embedded links for "securely" and
- - the search engine ("Startpage" or "DuckDuckGo").
- -->
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Procurar">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Procurar">
-<!ENTITY aboutTor.searchSP.privacy.label "de forma segura">
-<!ENTITY aboutTor.searchDDG.privacy.label "de forma segura">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "com">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "com">
-<!ENTITY aboutTor.searchSP.search.label "Página inicial">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Informação adicional:">
<!ENTITY aboutTor.torInfo2.label "País e endereço IP:">
diff --git a/src/chrome/locale/pt/aboutTor.properties b/src/chrome/locale/pt/aboutTor.properties
new file mode 100644
index 0000000..153401d
--- /dev/null
+++ b/src/chrome/locale/pt/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Procurar <a href="%1$S">de forma segura</a> com <a href="%2$S">Página inicial</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Procurar <a href="%1$S">de forma segura</a> com <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/ro/aboutTor.dtd b/src/chrome/locale/ro/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/ro/aboutTor.dtd
+++ b/src/chrome/locale/ro/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/ro/aboutTor.properties b/src/chrome/locale/ro/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/ro/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/ru/aboutTor.dtd b/src/chrome/locale/ru/aboutTor.dtd
index 0d53ea3..efe3ff1 100644
--- a/src/chrome/locale/ru/aboutTor.dtd
+++ b/src/chrome/locale/ru/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -23,33 +23,8 @@
<!ENTITY aboutTor.search.label "Поиск">
-<!-- Note to translators: the following 18 entities are used to construct a
- - sentence (either the SP or DDG entities are used, but not both at the
- - same time). In English, the sentence reads:
- - Search securely with Startpage.
- - or:
- - Search securely with DuckDuckGo.
- - The sentence contains two embedded links for "securely" and
- - the search engine ("Startpage" or "DuckDuckGo").
- -->
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Поиск">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Поиск">
-<!ENTITY aboutTor.searchSP.privacy.label "безопасно">
-<!ENTITY aboutTor.searchDDG.privacy.label "безопасно">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "with">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with">
-<!ENTITY aboutTor.searchSP.search.label "Начальная страница">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Дополнительные сведения:">
<!ENTITY aboutTor.torInfo2.label "Страна & IP-адрес">
diff --git a/src/chrome/locale/ru/aboutTor.properties b/src/chrome/locale/ru/aboutTor.properties
new file mode 100644
index 0000000..53e1de4
--- /dev/null
+++ b/src/chrome/locale/ru/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Поиск <a href="%1$S">безопасно</a> with <a href="%2$S">Начальная страница</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Поиск <a href="%1$S">безопасно</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/sco/aboutTor.dtd b/src/chrome/locale/sco/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/sco/aboutTor.dtd
+++ b/src/chrome/locale/sco/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/sco/aboutTor.properties b/src/chrome/locale/sco/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/sco/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/sk/aboutTor.dtd b/src/chrome/locale/sk/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/sk/aboutTor.dtd
+++ b/src/chrome/locale/sk/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/sk/aboutTor.properties b/src/chrome/locale/sk/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/sk/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/sl/aboutTor.dtd b/src/chrome/locale/sl/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/sl/aboutTor.dtd
+++ b/src/chrome/locale/sl/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/sl/aboutTor.properties b/src/chrome/locale/sl/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/sl/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/so/aboutTor.dtd b/src/chrome/locale/so/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/so/aboutTor.dtd
+++ b/src/chrome/locale/so/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/so/aboutTor.properties b/src/chrome/locale/so/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/so/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/son/aboutTor.dtd b/src/chrome/locale/son/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/son/aboutTor.dtd
+++ b/src/chrome/locale/son/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/son/aboutTor.properties b/src/chrome/locale/son/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/son/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/sq/aboutTor.dtd b/src/chrome/locale/sq/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/sq/aboutTor.dtd
+++ b/src/chrome/locale/sq/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/sq/aboutTor.properties b/src/chrome/locale/sq/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/sq/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/sr/aboutTor.dtd b/src/chrome/locale/sr/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/sr/aboutTor.dtd
+++ b/src/chrome/locale/sr/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/sr/aboutTor.properties b/src/chrome/locale/sr/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/sr/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/st/aboutTor.dtd b/src/chrome/locale/st/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/st/aboutTor.dtd
+++ b/src/chrome/locale/st/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/st/aboutTor.properties b/src/chrome/locale/st/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/st/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/su/aboutTor.dtd b/src/chrome/locale/su/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/su/aboutTor.dtd
+++ b/src/chrome/locale/su/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/su/aboutTor.properties b/src/chrome/locale/su/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/su/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/sv/aboutTor.dtd b/src/chrome/locale/sv/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/sv/aboutTor.dtd
+++ b/src/chrome/locale/sv/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/sv/aboutTor.properties b/src/chrome/locale/sv/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/sv/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/sw/aboutTor.dtd b/src/chrome/locale/sw/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/sw/aboutTor.dtd
+++ b/src/chrome/locale/sw/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/sw/aboutTor.properties b/src/chrome/locale/sw/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/sw/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/ta/aboutTor.dtd b/src/chrome/locale/ta/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/ta/aboutTor.dtd
+++ b/src/chrome/locale/ta/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/ta/aboutTor.properties b/src/chrome/locale/ta/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/ta/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/te/aboutTor.dtd b/src/chrome/locale/te/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/te/aboutTor.dtd
+++ b/src/chrome/locale/te/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/te/aboutTor.properties b/src/chrome/locale/te/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/te/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/tg/aboutTor.dtd b/src/chrome/locale/tg/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/tg/aboutTor.dtd
+++ b/src/chrome/locale/tg/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/tg/aboutTor.properties b/src/chrome/locale/tg/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/tg/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/th/aboutTor.dtd b/src/chrome/locale/th/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/th/aboutTor.dtd
+++ b/src/chrome/locale/th/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/th/aboutTor.properties b/src/chrome/locale/th/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/th/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/ti/aboutTor.dtd b/src/chrome/locale/ti/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/ti/aboutTor.dtd
+++ b/src/chrome/locale/ti/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/ti/aboutTor.properties b/src/chrome/locale/ti/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/ti/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/tk/aboutTor.dtd b/src/chrome/locale/tk/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/tk/aboutTor.dtd
+++ b/src/chrome/locale/tk/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/tk/aboutTor.properties b/src/chrome/locale/tk/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/tk/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/tr/aboutTor.dtd b/src/chrome/locale/tr/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/tr/aboutTor.dtd
+++ b/src/chrome/locale/tr/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/tr/aboutTor.properties b/src/chrome/locale/tr/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/tr/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/uk/aboutTor.dtd b/src/chrome/locale/uk/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/uk/aboutTor.dtd
+++ b/src/chrome/locale/uk/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/uk/aboutTor.properties b/src/chrome/locale/uk/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/uk/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/ur/aboutTor.dtd b/src/chrome/locale/ur/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/ur/aboutTor.dtd
+++ b/src/chrome/locale/ur/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/ur/aboutTor.properties b/src/chrome/locale/ur/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/ur/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/ve/aboutTor.dtd b/src/chrome/locale/ve/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/ve/aboutTor.dtd
+++ b/src/chrome/locale/ve/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/ve/aboutTor.properties b/src/chrome/locale/ve/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/ve/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/vi/aboutTor.dtd b/src/chrome/locale/vi/aboutTor.dtd
index 2987c1b..7aa92ba 100644
--- a/src/chrome/locale/vi/aboutTor.dtd
+++ b/src/chrome/locale/vi/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -23,33 +23,8 @@
<!ENTITY aboutTor.search.label "Tìm kiếm">
-<!-- Note to translators: the following 18 entities are used to construct a
- - sentence (either the SP or DDG entities are used, but not both at the
- - same time). In English, the sentence reads:
- - Search securely with Startpage.
- - or:
- - Search securely with DuckDuckGo.
- - The sentence contains two embedded links for "securely" and
- - the search engine ("Startpage" or "DuckDuckGo").
- -->
<!ENTITY aboutTor.searchSPPost.link "">
<!ENTITY aboutTor.searchDDGPost.link "">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.privacy.label "">
-<!ENTITY aboutTor.searchDDG.privacy.label "">
-<!ENTITY aboutTor.searchSP.privacy.link "">
-<!ENTITY aboutTor.searchDDG.privacy.link "">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "">
-<!ENTITY aboutTor.searchSP.search.label "">
-<!ENTITY aboutTor.searchDDG.search.label "">
-<!ENTITY aboutTor.searchSP.search.link "">
-<!ENTITY aboutTor.searchDDG.search.link "">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "">
<!ENTITY aboutTor.torInfo1.label "">
<!ENTITY aboutTor.torInfo2.label "">
diff --git a/src/chrome/locale/vi/aboutTor.properties b/src/chrome/locale/vi/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/vi/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/wa/aboutTor.dtd b/src/chrome/locale/wa/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/wa/aboutTor.dtd
+++ b/src/chrome/locale/wa/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/wa/aboutTor.properties b/src/chrome/locale/wa/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/wa/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/wo/aboutTor.dtd b/src/chrome/locale/wo/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/wo/aboutTor.dtd
+++ b/src/chrome/locale/wo/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/wo/aboutTor.properties b/src/chrome/locale/wo/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/wo/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/zh-CN/aboutTor.dtd b/src/chrome/locale/zh-CN/aboutTor.dtd
index 7a0a3d0..5d06afd 100644
--- a/src/chrome/locale/zh-CN/aboutTor.dtd
+++ b/src/chrome/locale/zh-CN/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -23,33 +23,8 @@
<!ENTITY aboutTor.search.label "搜索">
-<!-- Note to translators: the following 18 entities are used to construct a
- - sentence (either the SP or DDG entities are used, but not both at the
- - same time). In English, the sentence reads:
- - Search securely with Startpage.
- - or:
- - Search securely with DuckDuckGo.
- - The sentence contains two embedded links for "securely" and
- - the search engine ("Startpage" or "DuckDuckGo").
- -->
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "搜索">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "搜索">
-<!ENTITY aboutTor.searchSP.privacy.label "安全">
-<!ENTITY aboutTor.searchDDG.privacy.label "安全">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;">
-<!ENTITY aboutTor.searchSP.search.beforeLink.label "引擎">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label "引擎">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label "。">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label "。">
<!ENTITY aboutTor.torInfo1.label "更多信息:">
<!ENTITY aboutTor.torInfo2.label "国家与 IP 地址:">
diff --git a/src/chrome/locale/zh-CN/aboutTor.properties b/src/chrome/locale/zh-CN/aboutTor.properties
new file mode 100644
index 0000000..dc346d6
--- /dev/null
+++ b/src/chrome/locale/zh-CN/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=搜索 <a href="%1$S">安全</a> 引擎 <a href="%2$S">Startpage</a>。
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=搜索 <a href="%1$S">安全</a> 引擎 <a href="%2$S">DuckDuckGo</a>。
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/zh-HK/aboutTor.dtd b/src/chrome/locale/zh-HK/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/zh-HK/aboutTor.dtd
+++ b/src/chrome/locale/zh-HK/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/zh-HK/aboutTor.properties b/src/chrome/locale/zh-HK/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/zh-HK/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/zh-TW/aboutTor.dtd b/src/chrome/locale/zh-TW/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/zh-TW/aboutTor.dtd
+++ b/src/chrome/locale/zh-TW/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/zh-TW/aboutTor.properties b/src/chrome/locale/zh-TW/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/zh-TW/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
diff --git a/src/chrome/locale/zu/aboutTor.dtd b/src/chrome/locale/zu/aboutTor.dtd
index 2fc51c6..9f14022 100644
--- a/src/chrome/locale/zu/aboutTor.dtd
+++ b/src/chrome/locale/zu/aboutTor.dtd
@@ -1,5 +1,5 @@
<!--
- - Copyright (c) 2013, The Tor Project, Inc.
+ - Copyright (c) 2014, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
@@ -24,23 +24,6 @@
<!ENTITY aboutTor.search.label "Search">
<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">
-<!ENTITY aboutTor.searchSP.privacy.label "securely">
-<!ENTITY aboutTor.searchDDG.privacy.label "securely">
-<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?">
-<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html">
-<!ENTITY aboutTor.searchSP.privacy.afterLink.label "">
-<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "">
-
-<!ENTITY aboutTor.searchSP.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with ">
-<!ENTITY aboutTor.searchSP.search.label "Startpage">
-<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo">
-<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">
-<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/">
-<!ENTITY aboutTor.searchSP.search.afterLink.label ".">
-<!ENTITY aboutTor.searchDDG.search.afterLink.label ".">
<!ENTITY aboutTor.torInfo1.label "Additional Info:">
<!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/zu/aboutTor.properties b/src/chrome/locale/zu/aboutTor.properties
new file mode 100644
index 0000000..02088f0
--- /dev/null
+++ b/src/chrome/locale/zu/aboutTor.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
1
0

[tor-browser-bundle/master] Bug #10383: Enable NIST P224 and P256 accel support for 64bit builds.
by mikeperry@torproject.org 30 Mar '14
by mikeperry@torproject.org 30 Mar '14
30 Mar '14
commit e9a962ab77fe8f809da011dd944c965c2e038fc8
Author: Mike Perry <mikeperry-git(a)torproject.org>
Date: Sat Mar 29 21:03:50 2014 -0700
Bug #10383: Enable NIST P224 and P256 accel support for 64bit builds.
---
gitian/descriptors/linux/gitian-tor.yml | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml
index f0cb682..73181a0 100644
--- a/gitian/descriptors/linux/gitian-tor.yml
+++ b/gitian/descriptors/linux/gitian-tor.yml
@@ -65,7 +65,12 @@ script: |
cd openssl-*
find -type f | xargs touch --date="$REFERENCE_DATETIME"
#./Configure -shared --prefix=$INSTDIR/openssl linux-elf
- ./config -shared --prefix=$INSTDIR/openssl #enable-ec_nistp_64_gcc_128
+ if [ $GBUILD_BITS == "64" ];
+ then
+ ./config -shared --prefix=$INSTDIR/openssl enable-ec_nistp_64_gcc_128
+ else
+ ./config -shared --prefix=$INSTDIR/openssl
+ fi
make
make install
cp $INSTDIR/openssl/lib/libssl.so.1.0.0 $INSTDIR/Tor/
1
0

[tor-browser-bundle/master] Bug #9010: Add Turkish to beta and alpha language codes.
by mikeperry@torproject.org 30 Mar '14
by mikeperry@torproject.org 30 Mar '14
30 Mar '14
commit ef6fdf42854b083dca7163f63ab7533326c7ccad
Author: Mike Perry <mikeperry-git(a)torproject.org>
Date: Sat Mar 29 20:56:33 2014 -0700
Bug #9010: Add Turkish to beta and alpha language codes.
---
gitian/versions.alpha | 2 +-
gitian/versions.beta | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index 5adee9a..176477a 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -1,5 +1,5 @@
TORBROWSER_VERSION=4.0-alpha-1
-BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru vi zh-CN"
+BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN"
BUILD_PT_BUNDLES=1
VERIFY_TAGS=1
diff --git a/gitian/versions.beta b/gitian/versions.beta
index c4ad3fa..4c66e6b 100755
--- a/gitian/versions.beta
+++ b/gitian/versions.beta
@@ -1,5 +1,5 @@
TORBROWSER_VERSION=3.6-beta-1
-BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru vi zh-CN"
+BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN"
BUILD_PT_BUNDLES=1
VERIFY_TAGS=1
1
0