- tor-commits - lists.torproject.org

[translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
by translation＠torproject.org 28 May '20

28 May '20

commit b23331f6c27434077ba48d01dcbb1751d9eda6ed Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 28 21:15:16 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- ka/LC_MESSAGES/bridgedb.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ka/LC_MESSAGES/bridgedb.po b/ka/LC_MESSAGES/bridgedb.po index 4d45ebea2b..87e2898114 100644 --- a/ka/LC_MESSAGES/bridgedb.po +++ b/ka/LC_MESSAGES/bridgedb.po @@ -12,8 +12,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2020-05-14 14:21-0700\n" -"PO-Revision-Date: 2020-05-15 08:24+0000\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2020-05-28 21:04+0000\n" +"Last-Translator: Georgianization\n" "Language-Team: Georgian (http://www.transifex.com/otf/torproject/language/ka/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -94,7 +94,7 @@ msgstr "QR-კოდი შეიცავს თქვენი გადამ #: bridgedb/distributors/https/templates/bridges.html:110 msgid "BridgeDB encountered an error." -msgstr "" +msgstr "BridgeDB წააწყდა შეცდომას." #: bridgedb/distributors/https/templates/bridges.html:116 msgid "There currently aren't any bridges available..."

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 28 May '20

28 May '20

commit 584365ca709531e266653a41ac40faef2e42091a Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 28 20:49:03 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- cs.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cs.po b/cs.po index ccdb70c27d..fae38939b3 100644 --- a/cs.po +++ b/cs.po @@ -5,6 +5,7 @@ # Translators: # A5h8d0wf0x <littleslyfoxie28(a)gmail.com>, 2014 # Adam Slovacek <adamslovacek(a)gmail.com>, 2013 +# David Nowak <user412(a)secmail.pro>, 2020 # Filip Hruska <fhr(a)fhrnet.eu>, 2014 # Pivoj, 2015 # Jiří Vírava <appukonrad(a)gmail.com>, 2013-2014 @@ -22,8 +23,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-03-21 09:59+0100\n" -"PO-Revision-Date: 2020-03-25 13:13+0000\n" -"Last-Translator: erinm\n" +"PO-Revision-Date: 2020-05-28 20:42+0000\n" +"Last-Translator: David Nowak <user412(a)secmail.pro>\n" "Language-Team: Czech (http://www.transifex.com/otf/torproject/language/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
by translation＠torproject.org 28 May '20

28 May '20

commit 3eaf766b88428860205258641022eb3f5e89405b Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 28 20:47:18 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- cs.po | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/cs.po b/cs.po index 70fd8c0986..381a5aa7a2 100644 --- a/cs.po +++ b/cs.po @@ -5,6 +5,7 @@ # Translators: # A5h8d0wf0x <littleslyfoxie28(a)gmail.com>, 2014 # Adam Slovacek <adamslovacek(a)gmail.com>, 2013 +# David Nowak <user412(a)secmail.pro>, 2020 # Filip Hruska <fhr(a)fhrnet.eu>, 2014 # Pivoj, 2015 # Jiří Vírava <appukonrad(a)gmail.com>, 2013-2014 @@ -13,17 +14,17 @@ # Michal Stanke <mstanke(a)mozilla.cz>, 2019 # Michal Vašíček <michalvasicek(a)icloud.com>, 2017 # multiflexi <multi.flexi(a)seznam.cz>, 2019 -# mxsedlacek, 2014 +# e4c80bb921a3c296c143562260ee1dad_f42e1ae, 2014 # Roman Ondráček <ondracek.roman(a)centrum.cz>, 2016 -# Tomas Palik, 2015 -# Vlastimil Burián <inactive+burianvlastimil(a)transifex.com>, 2015 +# 789a65649261a6c6e79de75af5171cc5_5587230, 2015 +# 21efbac3a9def20c26f4869b16e85d8e_941b4b7 <039a9b1b0494d7365f3495af265a9a6d_318499>, 2015 msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-03-21 09:59+0100\n" -"PO-Revision-Date: 2020-03-25 13:13+0000\n" -"Last-Translator: erinm\n" +"PO-Revision-Date: 2020-05-28 20:42+0000\n" +"Last-Translator: David Nowak <user412(a)secmail.pro>\n" "Language-Team: Czech (http://www.transifex.com/otf/torproject/language/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -66,13 +67,13 @@ msgstr "Dodatečný software" msgid "" "You can install additional software automatically from your persistent " "storage when starting Tails." -msgstr "" +msgstr "Můžete instalovat dodatečný software automaticky z vašeho trvalého úložiště při spuštění Tails." #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:77 msgid "" "The following software is installed automatically from your persistent " "storage when starting Tails." -msgstr "" +msgstr "Následující software je automaticky instalován z vašeho trvalého úložiště při spouštění Tails." #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:135 #: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:171 @@ -847,7 +848,7 @@ msgstr "Zamknout obrazovku" #: config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/extension.js:79 msgid "Suspend" -msgstr "" +msgstr "Pozastavit" #: config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/extension.js:83 msgid "Restart" @@ -889,7 +890,7 @@ msgstr "nedostupné" msgid "" "{details} Please check your list of additional software or read the system " "log to understand the problem." -msgstr "" +msgstr "{details} Zkontrolujte seznam dodatečného softwaru nebo si přečtěte systémový protokol pro lepší pochopení problému." #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:153 msgid "" @@ -922,7 +923,7 @@ msgstr ", " #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:320 #, python-brace-format msgid "Add {packages} to your additional software?" -msgstr "" +msgstr "Přidat {packages} k vašemu dodatečnému softwaru?" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:292 msgid "" @@ -943,13 +944,13 @@ msgstr "Instalovat pouze jednou" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:331 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:371 msgid "The configuration of your additional software failed." -msgstr "" +msgstr "Konfigurace vašeho dodatečného softwaru selhala." #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:322 msgid "" "To install it automatically when starting Tails, you can create a persistent" " storage and activate the <b>Additional Software</b> feature." -msgstr "" +msgstr "K automatické instalaci při spouštění Tails můžete vytvořit trvalé úložiště a aktivovat vlastnost <b>Dodatečný software.</b>" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:325 msgid "Create Persistent Storage" @@ -991,7 +992,7 @@ msgstr "Odstranit" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:544 msgid "Installing your additional software from persistent storage..." -msgstr "" +msgstr "Instalace dodatečného softwaru z trvalého úložiště..." #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:546 msgid "This can take several minutes." @@ -1018,7 +1019,7 @@ msgstr "Zkontrolujte prosím síťové připojení, restartujte Tails nebo si p #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:603 msgid "The upgrade of your additional software failed" -msgstr "" +msgstr "Upgrade vašeho dodatečného softwaru selhal" #: config/chroot_local-includes/usr/local/lib/tails-additional-software-notify:37 msgid "Documentation"

1 0

[translation/https_everywhere] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere
by translation＠torproject.org 28 May '20

28 May '20

commit 7df792c722e3ac90918aae9364f64c06bcbfdc9e Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 28 20:46:02 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere --- cs/https-everywhere.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cs/https-everywhere.dtd b/cs/https-everywhere.dtd index 3a167bed9c..348a8a5f06 100644 --- a/cs/https-everywhere.dtd +++ b/cs/https-everywhere.dtd @@ -29,8 +29,8 @@ <!ENTITY https-everywhere.options.userRulesListed "Uživatelská pravidla pro HTTPS Everywhere"> <!ENTITY https-everywhere.options.disabledUrlsListed "Stránky HTTPS Everywhere zakázány"> <!ENTITY https-everywhere.options.updateChannelsWarning "Varování: Přidání aktualizačního kanálu může vystavit váš počítač riziku útoku. Nastavení v této sekci upravujte jen pokud opravdu víte, co děláte."> -<!ENTITY https-everywhere.options.addDisabledSite "Add Disabled Site"> -<!ENTITY https-everywhere.options.enterDisabledSite "Enter disabled site"> +<!ENTITY https-everywhere.options.addDisabledSite "Přidat blokovanou stránku"> +<!ENTITY https-everywhere.options.enterDisabledSite "Vstoupit na blokovanou stránku"> <!ENTITY https-everywhere.options.addUpdateChannel "Přidat aktualizační kanál"> <!ENTITY https-everywhere.options.enterUpdateChannelName "Zadejte název aktualizačního kanálu"> <!ENTITY https-everywhere.options.delete "Smazat">

1 0

[onionperf/master] Update TTFB/TTLB definitions in visualizations.
by karsten＠torproject.org 28 May '20

28 May '20

commit b3b4c5bb7fbe7ea8a177884e8d4712d3bded4757 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue May 26 09:42:42 2020 +0200 Update TTFB/TTLB definitions in visualizations. We're now including the time that it takes for tor to establish a circuit and attach a stream in the time to first/last byte. Implements #34215. --- onionperf/visualization.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/onionperf/visualization.py b/onionperf/visualization.py index 99a2f05..92727e3 100644 --- a/onionperf/visualization.py +++ b/onionperf/visualization.py @@ -56,11 +56,10 @@ class TGenVisualization(Visualization): "filesize_bytes": transfer_data["filesize_bytes"]} if "elapsed_seconds" in transfer_data: s = transfer_data["elapsed_seconds"] - if "command" in s: - if "first_byte" in s: - transfer["time_to_first_byte"] = s["first_byte"] - s["command"] - if "last_byte" in s: - transfer["time_to_last_byte"] = s["last_byte"] - s["command"] + if "first_byte" in s: + transfer["time_to_first_byte"] = s["first_byte"] + if "last_byte" in s: + transfer["time_to_last_byte"] = s["last_byte"] if "error_code" in transfer_data and transfer_data["error_code"] != "NONE": transfer["error_code"] = transfer_data["error_code"] if "unix_ts_start" in transfer_data:

1 0

[tor-browser-build/maint-9.5] Pickup -build2 for fixing Android build failure
by sysrqb＠torproject.org 28 May '20

28 May '20

commit 7e2d338211b0dfc9a74e0dee955b81ec47f7e211 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu May 28 17:59:17 2020 +0000 Pickup -build2 for fixing Android build failure --- projects/firefox/config | 2 +- rbm.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 6459294..012f82a 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 diff --git a/rbm.conf b/rbm.conf index cb492cf..77d8e56 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf: var: torbrowser_version: '9.5' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 9.0.10 project_name: tor-browser

1 0

[tor-browser/tor-browser-68.9.0esr-9.5-1] Revert "Bug 1633568 - AdjustHelper can inform more listeners about Attribution changes. r=Grisha, a=RyanVM"
by sysrqb＠torproject.org 28 May '20

28 May '20

commit 6421b707dd0a0cfcde4c2c45a8747dfd2ca89c49 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu May 28 17:55:11 2020 +0000 Revert "Bug 1633568 - AdjustHelper can inform more listeners about Attribution changes. r=Grisha, a=RyanVM" This reverts commit 4d64699b7d664a70793431effc2f4e054ebf9230. --- .../org/mozilla/gecko/adjust/AdjustBrowserAppDelegate.java | 8 ++++---- .../base/java/org/mozilla/gecko/adjust/AdjustHelper.java | 14 ++++++-------- .../org/mozilla/gecko/adjust/AdjustHelperInterface.java | 2 +- .../mozilla/gecko/adjust/AttributionHelperListener.java | 11 ++--------- .../java/org/mozilla/gecko/adjust/StubAdjustHelper.java | 2 +- .../mozilla/gecko/telemetry/TelemetryCorePingDelegate.java | 7 ++----- 6 files changed, 16 insertions(+), 28 deletions(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/adjust/AdjustBrowserAppDelegate.java b/mobile/android/base/java/org/mozilla/gecko/adjust/AdjustBrowserAppDelegate.java index f160e971def3..aee0bba63a8a 100644 --- a/mobile/android/base/java/org/mozilla/gecko/adjust/AdjustBrowserAppDelegate.java +++ b/mobile/android/base/java/org/mozilla/gecko/adjust/AdjustBrowserAppDelegate.java @@ -13,18 +13,18 @@ import org.mozilla.gecko.util.IntentUtils; public class AdjustBrowserAppDelegate extends BrowserAppDelegate { private final AdjustHelperInterface adjustHelper; - private final AttributionHelperListener[] attributionHelperListeners; + private final AttributionHelperListener attributionHelperListener; - public AdjustBrowserAppDelegate(AttributionHelperListener... attributionHelperListeners) { + public AdjustBrowserAppDelegate(AttributionHelperListener attributionHelperListener) { this.adjustHelper = AdjustConstants.getAdjustHelper(); - this.attributionHelperListeners = attributionHelperListeners; + this.attributionHelperListener = attributionHelperListener; } @Override public void onCreate(BrowserApp browserApp, Bundle savedInstanceState) { adjustHelper.onCreate(browserApp, AdjustConstants.MOZ_INSTALL_TRACKING_ADJUST_SDK_APP_TOKEN, - attributionHelperListeners); + attributionHelperListener); final boolean isInAutomation = IntentUtils.getIsInAutomationFromEnvironment( new SafeIntent(browserApp.getIntent())); diff --git a/mobile/android/base/java/org/mozilla/gecko/adjust/AdjustHelper.java b/mobile/android/base/java/org/mozilla/gecko/adjust/AdjustHelper.java index 410a172e7750..19399e735bb5 100644 --- a/mobile/android/base/java/org/mozilla/gecko/adjust/AdjustHelper.java +++ b/mobile/android/base/java/org/mozilla/gecko/adjust/AdjustHelper.java @@ -21,9 +21,9 @@ import org.mozilla.gecko.AppConstants; public class AdjustHelper implements AdjustHelperInterface, OnAttributionChangedListener { private static final String LOGTAG = AdjustHelper.class.getSimpleName(); - private AttributionHelperListener[] attributionListeners; + private AttributionHelperListener attributionListener; - public void onCreate(final Context context, final String maybeAppToken, final AttributionHelperListener... listeners) { + public void onCreate(final Context context, final String maybeAppToken, final AttributionHelperListener listener) { final String environment; final LogLevel logLevel; if (AppConstants.MOZILLA_OFFICIAL) { @@ -37,7 +37,7 @@ public class AdjustHelper implements AdjustHelperInterface, OnAttributionChanged // We've got install tracking turned on -- we better have a token! throw new IllegalArgumentException("maybeAppToken must not be null"); } - attributionListeners = listeners; + attributionListener = listener; AdjustConfig config = new AdjustConfig(context, maybeAppToken, environment); config.setLogLevel(logLevel); config.setOnAttributionChangedListener(this); @@ -62,16 +62,14 @@ public class AdjustHelper implements AdjustHelperInterface, OnAttributionChanged @Override public void onAttributionChanged(AdjustAttribution attribution) { - if (attributionListeners == null) { + if (attributionListener == null) { throw new IllegalStateException("Expected non-null attribution listener."); } if (attribution == null) { - Log.e(LOGTAG, "Adjust attribution is null. Skipping informing listeners about this."); + Log.e(LOGTAG, "Adjust attribution is null; skipping campaign id retrieval."); return; } - for (AttributionHelperListener listener: attributionListeners) { - listener.onAttributionChanged(attribution); - } + attributionListener.onCampaignIdChanged(attribution.campaign); } } diff --git a/mobile/android/base/java/org/mozilla/gecko/adjust/AdjustHelperInterface.java b/mobile/android/base/java/org/mozilla/gecko/adjust/AdjustHelperInterface.java index 0e4b9ff6455c..aeb7b4334e9f 100644 --- a/mobile/android/base/java/org/mozilla/gecko/adjust/AdjustHelperInterface.java +++ b/mobile/android/base/java/org/mozilla/gecko/adjust/AdjustHelperInterface.java @@ -13,7 +13,7 @@ public interface AdjustHelperInterface { * Register the Application with the Adjust SDK. * @param appToken the (secret!) Adjust SDK per-application token to register with; may be null. */ - void onCreate(final Context context, final String appToken, final AttributionHelperListener... listener); + void onCreate(final Context context, final String appToken, final AttributionHelperListener listener); void onPause(); void onResume(); diff --git a/mobile/android/base/java/org/mozilla/gecko/adjust/AttributionHelperListener.java b/mobile/android/base/java/org/mozilla/gecko/adjust/AttributionHelperListener.java index ada55838707a..6dadd2261d7a 100644 --- a/mobile/android/base/java/org/mozilla/gecko/adjust/AttributionHelperListener.java +++ b/mobile/android/base/java/org/mozilla/gecko/adjust/AttributionHelperListener.java @@ -5,20 +5,13 @@ package org.mozilla.gecko.adjust; -import android.support.annotation.NonNull; - -import com.adjust.sdk.AdjustAttribution; - /** * Because of how our build module dependencies are structured, we aren't able to use * the {@link com.adjust.sdk.OnAttributionChangedListener} directly outside of {@link AdjustHelper}. * If the Adjust SDK is enabled, this listener should be notified when {@link com.adjust.sdk.OnAttributionChangedListener} * is fired (i.e. this listener would be daisy-chained to the Adjust one). The listener also - * inherits thread-safety from GeckoSharedPrefs which is used to store the attribution. + * inherits thread-safety from GeckoSharedPrefs which is used to store the campaign ID. */ public interface AttributionHelperListener { - /** - * @param attribution - new Adjust attribution configuration. - */ - void onAttributionChanged(@NonNull final AdjustAttribution attribution); + void onCampaignIdChanged(String campaignId); } diff --git a/mobile/android/base/java/org/mozilla/gecko/adjust/StubAdjustHelper.java b/mobile/android/base/java/org/mozilla/gecko/adjust/StubAdjustHelper.java index 386bd97c05e2..ddfed84bd73b 100644 --- a/mobile/android/base/java/org/mozilla/gecko/adjust/StubAdjustHelper.java +++ b/mobile/android/base/java/org/mozilla/gecko/adjust/StubAdjustHelper.java @@ -9,7 +9,7 @@ import android.content.Context; import android.content.Intent; public class StubAdjustHelper implements AdjustHelperInterface { - public void onCreate(final Context context, final String appToken, final AttributionHelperListener... listeners) { + public void onCreate(final Context context, final String appToken, final AttributionHelperListener listener) { // Do nothing. } diff --git a/mobile/android/base/java/org/mozilla/gecko/telemetry/TelemetryCorePingDelegate.java b/mobile/android/base/java/org/mozilla/gecko/telemetry/TelemetryCorePingDelegate.java index 5b54657d319c..fa00a37a7c16 100644 --- a/mobile/android/base/java/org/mozilla/gecko/telemetry/TelemetryCorePingDelegate.java +++ b/mobile/android/base/java/org/mozilla/gecko/telemetry/TelemetryCorePingDelegate.java @@ -9,14 +9,11 @@ package org.mozilla.gecko.telemetry; import android.accessibilityservice.AccessibilityServiceInfo; import android.content.Context; import android.content.SharedPreferences; -import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.annotation.WorkerThread; import android.util.Log; import android.view.accessibility.AccessibilityManager; -import com.adjust.sdk.AdjustAttribution; - import org.json.JSONArray; import org.json.JSONException; import org.mozilla.gecko.BrowserApp; @@ -276,7 +273,7 @@ public class TelemetryCorePingDelegate extends BrowserAppDelegateWithReference } @Override - public void onAttributionChanged(@NonNull final AdjustAttribution attribution) { - CampaignIdMeasurements.updateCampaignIdPref(getBrowserApp(), attribution.campaign); + public void onCampaignIdChanged(String campaignId) { + CampaignIdMeasurements.updateCampaignIdPref(getBrowserApp(), campaignId); } }

1 0

[tor-browser/tor-browser-68.9.0esr-9.5-1] Revert "Bug 1633568 - Introduce a installation ping. r=Grisha, a=RyanVM"
by sysrqb＠torproject.org 28 May '20

28 May '20

commit 7f05e7ab2f1badfd0108d9bf0a6ef34d28a62b87 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu May 28 17:55:04 2020 +0000 Revert "Bug 1633568 - Introduce a installation ping. r=Grisha, a=RyanVM" This reverts commit 7163fd7d989bcf114b43cba342f48639024d1141. --- .../base/java/org/mozilla/gecko/BrowserApp.java | 5 +- .../TelemetryInstallationPingDelegate.java | 128 -------------- .../TelemetryInstallationPingBuilder.java | 186 --------------------- .../stores/TelemetryInstallationPingStore.java | 102 ----------- 4 files changed, 1 insertion(+), 420 deletions(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java index 6ce56bcc7e68..2efae19ca7c5 100644 --- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java +++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java @@ -146,7 +146,6 @@ import org.mozilla.gecko.tabs.TabHistoryFragment; import org.mozilla.gecko.tabs.TabHistoryPage; import org.mozilla.gecko.tabs.TabsPanel; import org.mozilla.gecko.telemetry.TelemetryCorePingDelegate; -import org.mozilla.gecko.telemetry.TelemetryInstallationPingDelegate; import org.mozilla.gecko.telemetry.TelemetryUploadService; import org.mozilla.gecko.telemetry.measurements.SearchCountMeasurements; import org.mozilla.gecko.telemetry.TelemetryActivationPingDelegate; @@ -336,7 +335,6 @@ public class BrowserApp extends GeckoApp private final TelemetryCorePingDelegate mTelemetryCorePingDelegate = new TelemetryCorePingDelegate(); private final TelemetryActivationPingDelegate mTelemetryActivationPingDelegate = new TelemetryActivationPingDelegate(); - private final TelemetryInstallationPingDelegate mTelemetryInstallationPingDelegate = new TelemetryInstallationPingDelegate(); private final List<BrowserAppDelegate> delegates = Collections.unmodifiableList(Arrays.asList( new ScreenshotDelegate(), @@ -344,9 +342,8 @@ public class BrowserApp extends GeckoApp new ReaderViewBookmarkPromotion(), mTelemetryCorePingDelegate, mTelemetryActivationPingDelegate, - mTelemetryInstallationPingDelegate, new OfflineTabStatusDelegate(), - new AdjustBrowserAppDelegate(mTelemetryCorePingDelegate, mTelemetryInstallationPingDelegate) + new AdjustBrowserAppDelegate(mTelemetryCorePingDelegate) )); @NonNull diff --git a/mobile/android/base/java/org/mozilla/gecko/telemetry/TelemetryInstallationPingDelegate.java b/mobile/android/base/java/org/mozilla/gecko/telemetry/TelemetryInstallationPingDelegate.java deleted file mode 100644 index 55657a0d0efa..000000000000 --- a/mobile/android/base/java/org/mozilla/gecko/telemetry/TelemetryInstallationPingDelegate.java +++ /dev/null @@ -1,128 +0,0 @@ -/* - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, you can obtain one at http://mozilla.org/MPL/2.0/. - */ - -package org.mozilla.gecko.telemetry; - -import android.support.annotation.NonNull; -import android.util.Log; - -import com.adjust.sdk.AdjustAttribution; - -import org.mozilla.gecko.BrowserApp; -import org.mozilla.gecko.GeckoAppShell; -import org.mozilla.gecko.adjust.AttributionHelperListener; -import org.mozilla.gecko.delegates.BrowserAppDelegate; -import org.mozilla.gecko.telemetry.pingbuilders.TelemetryInstallationPingBuilder; -import org.mozilla.gecko.telemetry.pingbuilders.TelemetryInstallationPingBuilder.PingReason; -import org.mozilla.gecko.telemetry.schedulers.TelemetryUploadAllPingsImmediatelyScheduler; -import org.mozilla.gecko.telemetry.stores.TelemetryInstallationPingStore; -import org.mozilla.gecko.util.ThreadUtils; - -import java.io.IOException; - -public class TelemetryInstallationPingDelegate - extends BrowserAppDelegate - implements AttributionHelperListener { - - private static final String LOGTAG = "InstallPingDelegate"; - - @Override - public void onStart(BrowserApp browserApp) { - if (!TelemetryUploadService.isUploadEnabledByAppConfig(browserApp)) { - return; - } - - // Keep everything off of main thread. Don't need to burden it with telemetry. - ThreadUtils.postToBackgroundThread(() -> { - TelemetryInstallationPingStore store; - try { - store = new TelemetryInstallationPingStore(); - } catch (IllegalStateException e) { - // The store constructor might throw an IllegalStateException if it cannot access - // the store directory. - // This has been observed on CI mochitests, not sure about if this would also reproduce - // in the real world. - // We'll retry at the next app start. - Log.w(LOGTAG, "Cannot access ping's storage directory. Will retry later"); - return; - } - - // First allow for stored pings to be re-uploaded if the previous upload did not succeed. - // (A successful upload would delete the pings persisted to disk) - if (store.getCount() != 0) { - store.queuePingsForUpload(new TelemetryUploadAllPingsImmediatelyScheduler()); - } - - // Only need one of each pings. Check if we should create a new one. - if (!TelemetryInstallationPingStore.hasLightPingBeenQueuedForUpload()) { - TelemetryOutgoingPing ping = new TelemetryInstallationPingBuilder() - .setReason(PingReason.APP_STARTED) - .build(); - - try { - store.storePing(ping); - store.queuePingsForUpload(new TelemetryUploadAllPingsImmediatelyScheduler()); - store.setLightPingQueuedForUpload(); - } catch (IOException e) { - // #storePing() might throw in the process of persisting to disk. - // Nothing to do. At the next app start we'll try again to create a new ping, - // store and upload that. - Log.w(LOGTAG, "Could not store ping. Will try again later"); - } - } - }); - } - - @Override - public void onAttributionChanged(@NonNull final AdjustAttribution attribution) { - if (!TelemetryUploadService.isUploadEnabledByAppConfig(GeckoAppShell.getApplicationContext())) { - return; - } - - // Keep everything off of main thread. Don't need to burden it with telemetry. - ThreadUtils.postToBackgroundThread(() -> { - TelemetryInstallationPingStore store; - try { - store = new TelemetryInstallationPingStore(); - } catch (IllegalStateException e) { - // The store constructor might throw an IllegalStateException if it cannot access - // the store directory. - // This has been observed on CI mochitests, not sure about if this would also reproduce - // in the real world. - // Since the attributionChanged callback only fire once IRL this would mean we won't - // be sending the "adjust-available" ping. - Log.w(LOGTAG, "Cannot access ping's storage directory. " + - "Cannot send the \"adjust-available\" ping"); - return; - } - - // First allow for stored pings to be re-uploaded if the previous upload did not succeed. - // (A successful upload would delete the pings persisted to disk) - if (store.getCount() != 0) { - store.queuePingsForUpload(new TelemetryUploadAllPingsImmediatelyScheduler()); - } - - // It may be possible that in the app's lifetime Adjust campaigns are changed. - // Sanity check that the "adjust-available" ping has not yet been send. - if (!TelemetryInstallationPingStore.hasFullPingBeenQueuedForUpload()) { - TelemetryOutgoingPing ping = new TelemetryInstallationPingBuilder() - .setReason(PingReason.ADJUST_AVAILABLE) - .setAdjustProperties(attribution) - .build(); - - try { - store.storePing(ping); - store.queuePingsForUpload(new TelemetryUploadAllPingsImmediatelyScheduler()); - store.setFullPingQueuedForUpload(); - } catch (IOException e) { - // #storePing() might throw in the process of persisting to disk. - // Nothing we can do. The "adjust-available" ping is lost. - Log.w(LOGTAG, "Could not store the \"adjust-available\" ping"); - } - } - }); - } -} diff --git a/mobile/android/base/java/org/mozilla/gecko/telemetry/pingbuilders/TelemetryInstallationPingBuilder.java b/mobile/android/base/java/org/mozilla/gecko/telemetry/pingbuilders/TelemetryInstallationPingBuilder.java deleted file mode 100644 index 24f94c1d06a3..000000000000 --- a/mobile/android/base/java/org/mozilla/gecko/telemetry/pingbuilders/TelemetryInstallationPingBuilder.java +++ /dev/null @@ -1,186 +0,0 @@ -/* - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, you can obtain one at http://mozilla.org/MPL/2.0/. - */ - -package org.mozilla.gecko.telemetry.pingbuilders; - -import android.content.Context; -import android.content.SharedPreferences; -import android.os.Build; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.util.Log; - -import com.adjust.sdk.AdjustAttribution; - -import org.mozilla.gecko.AppConstants; -import org.mozilla.gecko.GeckoAppShell; -import org.mozilla.gecko.GeckoSharedPrefs; -import org.mozilla.gecko.GeckoThread; -import org.mozilla.gecko.Locales; -import org.mozilla.gecko.util.DateUtil; -import org.mozilla.gecko.util.HardwareUtils; - -import java.lang.reflect.Method; -import java.text.SimpleDateFormat; -import java.util.Calendar; -import java.util.Date; -import java.util.Locale; - -public class TelemetryInstallationPingBuilder extends TelemetryPingBuilder { - private static final String LOGTAG = "InstallPingBuilder"; - - public enum PingReason { - APP_STARTED("app-started"), - ADJUST_AVAILABLE("adjust-available"); - - PingReason(String reason) { - this.value = reason; - } - - public final String value; - } - - private static final String PING_TYPE = "installation"; - private static final int PING_FORMAT_VERSION = 1; - - private static final String PREF_KEY_SEQ_NUMBER = "installationPingSeqNumber"; - - private static final String PING_VERSION = "v"; - private static final String REASON = "reason"; - private static final String PING_QUEUED_TIMES = "seq"; - private static final String CLIENT_ID = "client_id"; - private static final String DEVICE_ID = "device_id"; - private static final String LOCALE = "locale"; - private static final String OS_NAME = "os"; - private static final String OS_VERSION = "osversion"; - private static final String DEVICE_MANUFACTURER = "manufacturer"; - private static final String DEVICE_MODEL = "model"; - private static final String DEVICE_ABI = "arch"; - private static final String PROFILE_DATE = "profile_date"; - private static final String PING_CREATION_TIME = "created"; - private static final String TIMEZONE_OFFSET = "tz"; - private static final String APP_NAME = "app_name"; - private static final String RELEASE_CHANNEL = "channel"; - private static final String ADJUST_CAMPAIGN = "campaign"; - private static final String ADJUST_ADGROUP = "adgroup"; - private static final String ADJUST_CREATIVE = "creative"; - private static final String ADJUST_NETWORK = "network"; - - public TelemetryInstallationPingBuilder() { - super(UNIFIED_TELEMETRY_VERSION, false); - setPayloadConstants(); - } - - @Override - public String getDocType() { - return PING_TYPE; - } - - @Override - public String[] getMandatoryFields() { - return new String[]{ - PING_VERSION, - REASON, - PING_QUEUED_TIMES, - CLIENT_ID, - DEVICE_ID, - LOCALE, - OS_NAME, - OS_VERSION, - DEVICE_MANUFACTURER, - DEVICE_MODEL, - DEVICE_ABI, - PROFILE_DATE, - PING_CREATION_TIME, - TIMEZONE_OFFSET, - APP_NAME, - RELEASE_CHANNEL, - }; - } - - public @NonNull TelemetryInstallationPingBuilder setReason(@NonNull PingReason reason) { - payload.put(REASON, reason.value); - - return this; - } - - public @NonNull TelemetryInstallationPingBuilder setAdjustProperties(@NonNull final AdjustAttribution attribution) { - payload.put(ADJUST_CAMPAIGN, attribution.campaign); - payload.put(ADJUST_ADGROUP, attribution.adgroup); - payload.put(ADJUST_CREATIVE, attribution.creative); - payload.put(ADJUST_NETWORK, attribution.network); - - return this; - } - - private void setPayloadConstants() { - payload.put(PING_VERSION, PING_FORMAT_VERSION); - payload.put(PING_QUEUED_TIMES, incrementAndGetQueueTimes()); - payload.put(CLIENT_ID, getGeckoClientID()); - payload.put(DEVICE_ID, getAdvertisingId()); - payload.put(LOCALE, Locales.getLanguageTag(Locale.getDefault())); - payload.put(OS_NAME, TelemetryPingBuilder.OS_NAME); - payload.put(OS_VERSION, Integer.toString(Build.VERSION.SDK_INT)); - payload.put(DEVICE_MANUFACTURER, Build.MANUFACTURER); - payload.put(DEVICE_MODEL, Build.MODEL); - payload.put(DEVICE_ABI, HardwareUtils.getRealAbi()); - payload.put(PROFILE_DATE, getGeckoProfileCreationDate()); - payload.put(PING_CREATION_TIME, new SimpleDateFormat("yyyy-MM-dd", Locale.US).format(new Date())); - payload.put(TIMEZONE_OFFSET, DateUtil.getTimezoneOffsetInMinutesForGivenDate(Calendar.getInstance())); - payload.put(APP_NAME, AppConstants.MOZ_APP_BASENAME); - payload.put(RELEASE_CHANNEL, AppConstants.MOZ_UPDATE_CHANNEL); - } - - private @Nullable String getGeckoClientID() { - // zero-ed Gecko profile that respects the expected format "8-4-4-4-12" chars - String clientID = "00000000-0000-0000-0000-000000000000"; - try { - clientID = GeckoThread.getActiveProfile().getClientId(); - } catch (Exception e) { - Log.w(LOGTAG, "Could not get Gecko Client ID", e); - } - - return clientID; - } - - private @Nullable String getAdvertisingId() { - String advertisingId = null; - try { - final Class<?> clazz = Class.forName("org.mozilla.gecko.advertising.AdvertisingUtil"); - final Method getAdvertisingId = clazz.getMethod("getAdvertisingId", Context.class); - advertisingId = (String) getAdvertisingId.invoke(clazz, GeckoAppShell.getApplicationContext()); - } catch (Exception e) { - Log.w(LOGTAG, "Could not get advertising ID", e); - } - - return advertisingId; - } - - // Ensure sequential increment and return in all instances. - private static synchronized int incrementAndGetQueueTimes() { - final SharedPreferences sharedPrefs = GeckoSharedPrefs.forProfile(GeckoAppShell.getApplicationContext()); - - // 1-based, always incremented - final int incrementedSeqNumber = sharedPrefs.getInt(PREF_KEY_SEQ_NUMBER, 0) + 1; - sharedPrefs.edit().putInt(PREF_KEY_SEQ_NUMBER, incrementedSeqNumber).apply(); - - return incrementedSeqNumber; - } - - private int getGeckoProfileCreationDate() { - // The method returns days since epoch. An int is enough. - int date = 0; - try { - date = TelemetryActivationPingBuilder.getProfileCreationDate( - GeckoAppShell.getApplicationContext(), - GeckoThread.getActiveProfile()).intValue(); - } catch (NullPointerException e) { - Log.w(LOGTAG, "Could not get Gecko profile creation date", e); - } - - return date; - } -} diff --git a/mobile/android/base/java/org/mozilla/gecko/telemetry/stores/TelemetryInstallationPingStore.java b/mobile/android/base/java/org/mozilla/gecko/telemetry/stores/TelemetryInstallationPingStore.java deleted file mode 100644 index c6aacab25e73..000000000000 --- a/mobile/android/base/java/org/mozilla/gecko/telemetry/stores/TelemetryInstallationPingStore.java +++ /dev/null @@ -1,102 +0,0 @@ -/* - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, you can obtain one at http://mozilla.org/MPL/2.0/. - */ - -package org.mozilla.gecko.telemetry.stores; - -import android.content.SharedPreferences; -import android.os.Parcel; -import android.os.Parcelable; -import android.support.annotation.NonNull; - -import org.mozilla.gecko.GeckoAppShell; -import org.mozilla.gecko.GeckoSharedPrefs; -import org.mozilla.gecko.GeckoThread; -import org.mozilla.gecko.telemetry.schedulers.TelemetryUploadAllPingsImmediatelyScheduler; - -import java.io.File; - -public class TelemetryInstallationPingStore extends TelemetryJSONFilePingStore { - private static final String PREF_KEY_WAS_LIGHT_PING_STORED = "wasLightInstallationPingStored"; - private static final String PREF_KEY_WAS_FULL_PING_STORED = "wasFullInstallationPingStored"; - private static final String INSTALLATION_PING_STORE_DIR = "installation_ping"; - private static final String DEFAULT_PROFILE = "default"; - - public TelemetryInstallationPingStore() { - super(getInstallationPingStoreDir(), getCurrentProfileName()); - } - - public TelemetryInstallationPingStore(@NonNull final File storeDir, @NonNull final String profileName) { - super(storeDir, profileName); - } - - @Override - public void maybePrunePings() { - // no-op - // Successfully uploaded pings will be deleted in onUploadAttemptComplete(..). - } - - public void queuePingsForUpload(@NonNull final TelemetryUploadAllPingsImmediatelyScheduler scheduler) { - scheduler.scheduleUpload(GeckoAppShell.getApplicationContext(), this); - } - - public static boolean hasLightPingBeenQueuedForUpload() { - return getSharedPrefs().getBoolean(PREF_KEY_WAS_LIGHT_PING_STORED, false); - } - - public static boolean hasFullPingBeenQueuedForUpload() { - return getSharedPrefs().getBoolean(PREF_KEY_WAS_FULL_PING_STORED, false); - } - - public void setLightPingQueuedForUpload() { - getSharedPrefs().edit().putBoolean(PREF_KEY_WAS_LIGHT_PING_STORED, true).apply(); - } - - public void setFullPingQueuedForUpload() { - getSharedPrefs().edit().putBoolean(PREF_KEY_WAS_FULL_PING_STORED, true).apply(); - } - - private static @NonNull SharedPreferences getSharedPrefs() { - return GeckoSharedPrefs.forProfile(GeckoAppShell.getApplicationContext()); - } - - private static @NonNull File getInstallationPingStoreDir() { - return GeckoAppShell.getApplicationContext().getFileStreamPath(INSTALLATION_PING_STORE_DIR); - } - - private static @NonNull String getCurrentProfileName() { - return GeckoThread.getActiveProfile() != null ? - GeckoThread.getActiveProfile().getName() : - DEFAULT_PROFILE; - } - - - // Class needs to be Parcelable as it will be passed through Intents - public static final Parcelable.Creator<TelemetryInstallationPingStore> CREATOR = - new Parcelable.Creator<TelemetryInstallationPingStore>() { - - @Override - public TelemetryInstallationPingStore createFromParcel(final Parcel source) { - final String storeDirPath = source.readString(); - final String profileName = source.readString(); - return new TelemetryInstallationPingStore(new File(storeDirPath), profileName); - } - - @Override - public TelemetryInstallationPingStore[] newArray(final int size) { - return new TelemetryInstallationPingStore[size]; - } - }; - - @Override - public int describeContents() { - return 0; - } - - @Override - public void writeToParcel(final Parcel dest, final int flags) { - super.writeToParcel(dest, flags); - } -}

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 28 May '20

28 May '20

commit 0aa7f23fb4f87dafb7d0711945e5a66193a038ed Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 28 16:54:35 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+el.po | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/contents+el.po b/contents+el.po index 095a0bf9f4..b79d68379f 100644 --- a/contents+el.po +++ b/contents+el.po @@ -623,7 +623,7 @@ msgstr "" #: https//support.torproject.org/glossary/fte/ #: (content/glossary/fte/contents+en.lrword.term) msgid "fte" -msgstr "" +msgstr "fte" #: https//support.torproject.org/glossary/fte/ #: (content/glossary/fte/contents+en.lrword.definition) @@ -643,7 +643,7 @@ msgstr "" #: https//support.torproject.org/glossary/gsoc/ #: (content/glossary/gsoc/contents+en.lrword.term) msgid "GSoC" -msgstr "" +msgstr "GSoC" #: https//support.torproject.org/glossary/gsoc/ #: (content/glossary/gsoc/contents+en.lrword.definition) @@ -655,7 +655,7 @@ msgstr "" #: https//support.torproject.org/glossary/gsod/ #: (content/glossary/gsod/contents+en.lrword.term) msgid "GSoD" -msgstr "" +msgstr "GSoD" #: https//support.torproject.org/glossary/gsod/ #: (content/glossary/gsod/contents+en.lrword.definition) @@ -788,7 +788,7 @@ msgstr "" #: https//support.torproject.org/glossary/internet-service-provider-isp-/ #: (content/glossary/internet-service-provider-isp-/contents+en.lrword.term) msgid "internet service provider (ISP)" -msgstr "" +msgstr "πάροχος υπηρεσίας διαδικτύου (ISP)" #: https//support.torproject.org/glossary/internet-service-provider-isp-/ #: (content/glossary/internet-service-provider-isp-/contents+en.lrword.definition) @@ -975,7 +975,7 @@ msgstr "" #: https//support.torproject.org/glossary/noscript/ #: (content/glossary/noscript/contents+en.lrword.term) msgid "NoScript" -msgstr "" +msgstr "NoScript" #: https//support.torproject.org/glossary/noscript/ #: (content/glossary/noscript/contents+en.lrword.definition) @@ -996,7 +996,7 @@ msgstr "" #: https//support.torproject.org/glossary/nyx/ #: (content/glossary/nyx/contents+en.lrword.term) msgid "nyx" -msgstr "" +msgstr "nyx" #: https//support.torproject.org/glossary/nyx/ #: (content/glossary/nyx/contents+en.lrword.definition) @@ -1023,7 +1023,7 @@ msgstr "" #: https//support.torproject.org/glossary/obfs3/ #: (content/glossary/obfs3/contents+en.lrword.definition) msgid "Obfs3 is not supported anymore." -msgstr "" +msgstr "Το Obfs3 δεν υποστηρίζεται πλέον." #: https//support.torproject.org/glossary/obfs4/ #: (content/glossary/obfs4/contents+en.lrword.term) @@ -1042,7 +1042,7 @@ msgstr "" #: https//support.torproject.org/glossary/onion-address/ #: (content/glossary/onion-address/contents+en.lrword.term) msgid "onion address" -msgstr "" +msgstr "διεύθυνση onion" #: https//support.torproject.org/glossary/onion-address/ #: (content/glossary/onion-address/contents+en.lrword.definition) @@ -1061,7 +1061,7 @@ msgstr "" #: https//support.torproject.org/glossary/onion-browser/ #: (content/glossary/onion-browser/contents+en.lrword.term) msgid "Onion Browser" -msgstr "" +msgstr "Περιηγητής Onion" #: https//support.torproject.org/glossary/onion-browser/ #: (content/glossary/onion-browser/contents+en.lrword.definition) @@ -1087,7 +1087,7 @@ msgstr "" #: https//support.torproject.org/glossary/onion-services/ #: (content/glossary/onion-services/contents+en.lrword.term) msgid "onion services" -msgstr "" +msgstr "υπηρεσίες onion" #: https//support.torproject.org/glossary/onion-services/ #: (content/glossary/onion-services/contents+en.lrword.definition) @@ -1107,7 +1107,7 @@ msgstr "" #: https//support.torproject.org/glossary/onion-site/ #: (content/glossary/onion-site/contents+en.lrword.term) msgid "onion site" -msgstr "" +msgstr "σελίδα onion" #: https//support.torproject.org/glossary/onion-site/ #: (content/glossary/onion-site/contents+en.lrword.definition) @@ -1124,7 +1124,7 @@ msgstr "" #: https//support.torproject.org/glossary/onionoo/ #: (content/glossary/onionoo/contents+en.lrword.term) msgid "Onionoo" -msgstr "" +msgstr "Onionoo" #: https//support.torproject.org/glossary/onionoo/ #: (content/glossary/onionoo/contents+en.lrword.definition) @@ -1158,7 +1158,7 @@ msgstr "" #: https//support.torproject.org/glossary/ooni/ #: (content/glossary/ooni/contents+en.lrword.term) msgid "OONI" -msgstr "" +msgstr "OONI" #: https//support.torproject.org/glossary/ooni/ #: (content/glossary/ooni/contents+en.lrword.definition) @@ -1172,7 +1172,7 @@ msgstr "" #: https//support.torproject.org/glossary/operating-system-os-/ #: (content/glossary/operating-system-os-/contents+en.lrword.term) msgid "operating system (OS)" -msgstr "" +msgstr "λειτουργικό σύστημα (OS)" #: https//support.torproject.org/glossary/operating-system-os-/ #: (content/glossary/operating-system-os-/contents+en.lrword.definition) @@ -1202,7 +1202,7 @@ msgstr "" #: https//support.torproject.org/glossary/orfox/ #: (content/glossary/orfox/contents+en.lrword.term) msgid "Orfox" -msgstr "" +msgstr "Orfox" #: https//support.torproject.org/glossary/orfox/ #: (content/glossary/orfox/contents+en.lrword.definition) @@ -1232,7 +1232,7 @@ msgstr "" #: https//support.torproject.org/glossary/private-key/ #: (content/glossary/private-key/contents+en.lrword.term) msgid "private key" -msgstr "" +msgstr "Ιδιωτικό κλειδί" #: https//support.torproject.org/glossary/private-key/ #: (content/glossary/private-key/contents+en.lrword.definition) @@ -1250,7 +1250,7 @@ msgstr "" #: https//support.torproject.org/glossary/proxy/ #: (content/glossary/proxy/contents+en.lrword.term) msgid "proxy" -msgstr "" +msgstr "διαμεσολαβητής" #: https//support.torproject.org/glossary/proxy/ #: (content/glossary/proxy/contents+en.lrword.definition) @@ -1271,7 +1271,7 @@ msgstr "" #: https//support.torproject.org/glossary/public-key/ #: (content/glossary/public-key/contents+en.lrword.term) msgid "public key" -msgstr "" +msgstr "δημόσιο κλειδί" #: https//support.torproject.org/glossary/public-key/ #: (content/glossary/public-key/contents+en.lrword.definition) @@ -1288,7 +1288,7 @@ msgstr "" #: https//support.torproject.org/glossary/public-key-cryptography/ #: (content/glossary/public-key-cryptography/contents+en.lrword.term) msgid "public key cryptography" -msgstr "" +msgstr "κρυπτογράφηση δημόσιου κλειδιού" #: https//support.torproject.org/glossary/public-key-cryptography/ #: (content/glossary/public-key-cryptography/contents+en.lrword.definition) @@ -1393,7 +1393,7 @@ msgstr "" #: https//support.torproject.org/glossary/server/ #: (content/glossary/server/contents+en.lrword.term) msgid "server" -msgstr "" +msgstr "διακομιστής" #: https//support.torproject.org/glossary/server/ #: (content/glossary/server/contents+en.lrword.definition)

1 0

[translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
by translation＠torproject.org 28 May '20

28 May '20

commit f66801117b4ba7960d7bfe623869460166075fee Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 28 16:54:01 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+el.po | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/contents+el.po b/contents+el.po index 6956aa6f42..b6d5292a47 100644 --- a/contents+el.po +++ b/contents+el.po @@ -1,6 +1,7 @@ +# # Translators: # Nikos Tsirakis <>, 2019 -# Wasilis Mandratzis-Walz <inactive+beonex123(a)transifex.com>, 2019 +# 38b991705053a11862912edec5d4fc15_99319de <e3751b561a133daad5ac37aeb3619d1a_667224>, 2019 # Alex <hestia(a)riseup.net>, 2019 # Panagiotis Vasilopoulos, 2019 # Adrian Pappas <pappasadrian(a)gmail.com>, 2019 @@ -11,6 +12,7 @@ # LaScapigliata <ditri2000(a)hotmail.com>, 2019 # Dimitris Adamakis <gt.dimitris(a)gmail.com>, 2020 # erinm, 2020 +# george k <norhorn(a)gmail.com>, 2020 # msgid "" msgstr "" @@ -18,7 +20,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-02-24 13:39+CET\n" "PO-Revision-Date: 2019-03-09 10:41+0000\n" -"Last-Translator: erinm, 2020\n" +"Last-Translator: george k <norhorn(a)gmail.com>, 2020\n" "Language-Team: Greek (https://www.transifex.com/otf/teams/1519/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -36,7 +38,7 @@ msgstr "Αρχική" #: https//www.torproject.org/ (content/contents+en.lrpage.body) msgid "###### ABOUT US ######" -msgstr "" +msgstr "###### ΣΧΕΤΙΚΑ ΜΕ ΕΜΑΣ ######" #: https//www.torproject.org/ (content/contents+en.lrpage.body) msgid "" @@ -47,13 +49,16 @@ msgstr "" #: https//www.torproject.org/ (content/contents+en.lrpage.body) msgid "We are the Tor Project, a 501(c)3 US nonprofit." -msgstr "" +msgstr "Είμαστε το Tor Project, μια μη κερδοσκοπική 501(c)3 US." #: https//www.torproject.org/ (content/contents+en.lrpage.body) msgid "" "We advance human rights and defend your privacy online through free software" " and open networks. [Meet our team](about/people)." msgstr "" +"Προωθούμε τα ανθρώπινα δικαιώματα και υπερασπίζουμε το απόρρητο σας στο " +"διαδίκτυο μέσω δωρεάν λογισμικού και ανοιχτών δικτύων. [Γνωρίστε την ομάδα " +"μας] (about/people)." #: https//www.torproject.org/contact/ #: (content/contact/contents+en.lrpage.title) @@ -70,7 +75,7 @@ msgstr "το Tor Project" #: https//www.torproject.org/contact/ #: (content/contact/contents+en.lrpage.body) msgid "### Get Support" -msgstr "" +msgstr "### Λάβετε Υποστήριξη" #: https//www.torproject.org/contact/ #: (content/contact/contents+en.lrpage.body)

1 0