Split (1)

train · 69.7k rows

Subsets and Splits

No community queries yet

The top public SQL queries from the community will appear here once available.

in_source_id stringlengths 13 58	issue stringlengths 3 241k	before_files listlengths 0 3	after_files listlengths 0 3	pr_diff stringlengths 109 107M ⌀
kserve__kserve-2478	Update ModelMesh version to `v0.10.0` #### Proposed Changes Update to the latest ModelMesh version (`v0.10.0`) > If your changes should also be in the most recent release, add the corresponding "cherrypick-0.X" label to the original PR; for example, "cherrypick-0.10". #### TODOs: > - [ ] Best practice is to open a PR for the cherry-pick yourself after your original PR has been merged into the main branch. > - [ ] After the cherry-pick PR has merged, remove the cherry-pick label from the original PR. Type of changes - [x] This change requires a documentation update --> https://github.com/kserve/website/pull/214 Special notes for your reviewer: 1. Please confirm that if this PR changes any image versions, then that's the sole change this PR makes. YES Checklist: - [x] Have you made corresponding changes to the documentation? Release note: <!-- Write your release note: 1. Enter your extended release note in the below block. If the PR requires additional action from users switching to the new release, include the string "action required". 3. If no release note is required, just write "NONE". --> ```release-note ??? ``` Not sure, maybe, - "Updgrade to ModelMesh v0.10.0" or - point to ModelMesh release notes here https://github.com/kserve/modelmesh-serving/releases/tag/v0.10.0 --- /cc @yuzisun @rachitchauhan43 @njhill	[ { "content": "# Copyright 2021 The KServe Authors.\n#\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by a...	[ { "content": "# Copyright 2021 The KServe Authors.\n#\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by a...	diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml index 7f56710651e..1529ca65444 100644 --- a/.github/workflows/e2e-test.yml +++ b/.github/workflows/e2e-test.yml @@ -47,17 +47,17 @@ jobs: ./test/scripts/gh-actions/build-server-runtimes.sh predictor,transformer docker image ls cat ./config/overlays/test/configmap/inferenceservice.yaml - + - name: Upload sklearn server image uses: ishworkh/docker-image-artifact-upload@v1 with: image: "kserve/sklearnserver:${{ github.sha }}" - + - name: Upload xgb server image uses: ishworkh/docker-image-artifact-upload@v1 with: image: "kserve/xgbserver:${{ github.sha }}" - + - name: Upload lgb server image uses: ishworkh/docker-image-artifact-upload@v1 with: @@ -67,7 +67,7 @@ jobs: uses: ishworkh/docker-image-artifact-upload@v1 with: image: "kserve/pmmlserver:${{ github.sha }}" - + - name: Upload paddle image uses: ishworkh/docker-image-artifact-upload@v1 with: @@ -77,7 +77,7 @@ jobs: uses: ishworkh/docker-image-artifact-upload@v1 with: image: "kserve/image-transformer:${{ github.sha }}" - + explainer-runtime-build: runs-on: ubuntu-latest steps: @@ -93,17 +93,17 @@ jobs: uses: ishworkh/docker-image-artifact-upload@v1 with: image: "kserve/aix-explainer:${{ github.sha }}" - + - name: Upload alibi image uses: ishworkh/docker-image-artifact-upload@v1 with: image: "kserve/alibi-explainer:${{ github.sha }}" - + - name: Upload art explainer image uses: ishworkh/docker-image-artifact-upload@v1 with: image: "kserve/art-explainer:${{ github.sha }}" - + test-fast: runs-on: ubuntu-latest needs: [kserve-image-build, predictor-runtime-build, explainer-runtime-build] @@ -114,17 +114,17 @@ jobs: go-version: '1.17.3' - uses: ./.github/actions/minikube-setup - uses: ./.github/actions/base-download - + - name: Download sklearn server image uses: ishworkh/docker-image-artifact-download@v1 with: image: "kserve/sklearnserver:${{ github.sha }}" - + - name: Download xgb server image uses: ishworkh/docker-image-artifact-download@v1 with: image: "kserve/xgbserver:${{ github.sha }}" - + - name: Download lgb server image uses: ishworkh/docker-image-artifact-download@v1 with: @@ -133,8 +133,8 @@ jobs: - name: Download pmml image uses: ishworkh/docker-image-artifact-download@v1 with: - image: "kserve/pmmlserver:${{ github.sha }}" - + image: "kserve/pmmlserver:${{ github.sha }}" + - name: Install KServe run: \| ./test/scripts/gh-actions/setup-kserve.sh @@ -151,7 +151,7 @@ jobs: if: always() run: \| ./test/scripts/gh-actions/status-check.sh - + test-slow: runs-on: ubuntu-latest needs: [kserve-image-build, predictor-runtime-build, explainer-runtime-build] @@ -162,22 +162,22 @@ jobs: go-version: '1.17.3' - uses: ./.github/actions/minikube-setup - uses: ./.github/actions/base-download - + - name: Download sklearn server image uses: ishworkh/docker-image-artifact-download@v1 with: image: "kserve/sklearnserver:${{ github.sha }}" - + - name: Download xgb server image uses: ishworkh/docker-image-artifact-download@v1 with: image: "kserve/xgbserver:${{ github.sha }}" - + - name: Download lgb server image uses: ishworkh/docker-image-artifact-download@v1 with: image: "kserve/lgbserver:${{ github.sha }}" - + - name: Download paddle image uses: ishworkh/docker-image-artifact-download@v1 with: @@ -215,12 +215,12 @@ jobs: uses: ishworkh/docker-image-artifact-download@v1 with: image: "kserve/sklearnserver:${{ github.sha }}" - + - name: Download aix image uses: ishworkh/docker-image-artifact-download@v1 with: image: "kserve/aix-explainer:${{ github.sha }}" - + - name: Download alibi image uses: ishworkh/docker-image-artifact-download@v1 with: @@ -256,11 +256,11 @@ jobs: - uses: actions/setup-go@v2 with: go-version: '1.17.3' - + - uses: ./.github/actions/minikube-setup - uses: ./.github/actions/base-download - - + + - name: Download sklearn server image uses: ishworkh/docker-image-artifact-download@v1 with: @@ -292,3 +292,49 @@ jobs: if: always() run: \| ./test/scripts/gh-actions/status-check.sh + + test-qpext: + runs-on: ubuntu-latest + needs: [kserve-image-build, predictor-runtime-build] + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-go@v2 + with: + go-version: '1.17.3' + - uses: ./.github/actions/minikube-setup + - uses: ./.github/actions/base-download + - name: Build queue proxy extension image + run: \| + ./test/scripts/gh-actions/build-qpext-image.sh + docker image ls + - name: Upload qpext image + uses: ishworkh/docker-image-artifact-upload@v1 + with: + image: "kserve/qpext:${{ github.sha }}" + - name: Download qpext image + uses: ishworkh/docker-image-artifact-download@v1 + with: + image: "kserve/qpext:${{ github.sha }}" + - name: Download sklearn server image + uses: ishworkh/docker-image-artifact-download@v1 + with: + image: "kserve/sklearnserver:${{ github.sha }}" + - name: Install KServe + run: \| + ./test/scripts/gh-actions/setup-kserve.sh + + kubectl get pods -n kserve + kubectl describe pods -n kserve + - name: Patch qpext image + run : \| + kubectl patch configmaps -n knative-serving config-deployment --patch '{"data": {"queueSidecarImage": "kserve/qpext:${{ github.sha }}"}}' + kubectl describe configmaps -n knative-serving config-deployment + - name: Run queue proxy extension E2E tests + timeout-minutes: 30 + run: \| + ./test/scripts/gh-actions/run-qpext-test.sh + kubectl get pods -n kserve + - name: Check system status + if: always() + run: \| + ./test/scripts/gh-actions/status-check.sh diff --git a/.github/workflows/qpext-docker-publish.yml b/.github/workflows/qpext-docker-publish.yml new file mode 100644 index 00000000000..144ac152dbc --- /dev/null +++ b/.github/workflows/qpext-docker-publish.yml @@ -0,0 +1,79 @@ +name: Queue Proxy Extension Docker Publisher + +on: + push: + # Publish `master` as Docker `latest` image. + branches: + - master + + # Publish `v1.2.3` tags as releases. + tags: + - v* + + # Run tests for any PRs. + pull_request: + +env: + IMAGE_NAME: qpext + +jobs: + # Run tests. + # See also https://docs.docker.com/docker-hub/builds/automated-testing/ + test: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - name: Run tests + run: \| + if [ -f docker-compose.test.yml ]; then + docker-compose --file docker-compose.test.yml build + docker-compose --file docker-compose.test.yml run sut + else + cd qpext + docker build . --file qpext.Dockerfile + fi + + # Push image to GitHub Packages. + # See also https://docs.docker.com/docker-hub/builds/ + push: + # Ensure test job passes before pushing image. + needs: test + + runs-on: ubuntu-latest + if: github.event_name == 'push' + + steps: + - uses: actions/checkout@v2 + + - name: Build image + run: \| + cd qpext + docker build . --file qpext.Dockerfile --tag $IMAGE_NAME + + - name: Log into registry + run: docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASSWORD }} + + - name: Push image + run: \| + IMAGE_ID=kserve/$IMAGE_NAME + + # Change all uppercase to lowercase + IMAGE_ID=$(echo $IMAGE_ID \| tr '[A-Z]' '[a-z]') + + # Strip git ref prefix from version + VERSION=$(echo "${{ github.ref }}" \| sed -e 's,./\(.\),\1,') + + # Strip "v" prefix from tag name + # [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION \| sed -e 's/^v//') + + # Use Docker `latest` tag convention + [ "$VERSION" == "master" ] && VERSION=latest + + echo IMAGE_ID=$IMAGE_ID + echo VERSION=$VERSION + + docker tag $IMAGE_NAME $IMAGE_ID:$VERSION + docker push $IMAGE_ID:$VERSION + diff --git a/Makefile b/Makefile index 0568faecd09..dc87d1e97c0 100644 --- a/Makefile +++ b/Makefile @@ -12,6 +12,7 @@ PADDLE_IMG ?= paddleserver ALIBI_IMG ?= alibi-explainer AIX_IMG ?= aix-explainer STORAGE_INIT_IMG ?= storage-initializer +QPEXT_IMG ?= qpext CRD_OPTIONS ?= "crd:maxDescLen=0" KSERVE_ENABLE_SELF_SIGNED_CA ?= false # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary. @@ -263,6 +264,12 @@ docker-build-storageInitializer: docker-push-storageInitializer: docker-build-storageInitializer docker push ${KO_DOCKER_REPO}/${STORAGE_INIT_IMG} +docker-build-qpext: + cd qpext && docker build -t ${KO_DOCKER_REPO}/${QPEXT_IMG} -f qpext.Dockerfile . + +docker-build-push-qpext: docker-build-qpext + docker push ${KO_DOCKER_REPO}/${QPEXT_IMG} + controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary. $(CONTROLLER_GEN): $(LOCALBIN) test -s $(LOCALBIN)/controller-gen \|\| GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_TOOLS_VERSION) diff --git a/charts/kserve/templates/configmap.yaml b/charts/kserve/templates/configmap.yaml index 2f4cab0b1af..94e4a1faab1 100644 --- a/charts/kserve/templates/configmap.yaml +++ b/charts/kserve/templates/configmap.yaml @@ -200,6 +200,11 @@ data: transformers: \|- { } + metricsAggregator: \|- + { + "enableMetricAggregation": {{ .Values.kserve.metricsaggregator.enableMetricAggregation }}, + "enablePrometheusScraping" : {{ .Values.kserve.metricsaggregator.enablePrometheusScraping }} + } kind: ConfigMap metadata: name: inferenceservice-config diff --git a/charts/kserve/values.yaml b/charts/kserve/values.yaml index 4ac31db49f0..8b83f349cfa 100644 --- a/charts/kserve/values.yaml +++ b/charts/kserve/values.yaml @@ -10,6 +10,9 @@ kserve: s3: accessKeyIdName: AWS_ACCESS_KEY_ID secretAccessKeyName: AWS_SECRET_ACCESS_KEY + metricsaggregator: + enableMetricAggregation: "false" + enablePrometheusScraping: "false" controller: deploymentMode: "Serverless" gateway: diff --git a/config/configmap/inferenceservice.yaml b/config/configmap/inferenceservice.yaml index 70e605b950a..99343afd543 100644 --- a/config/configmap/inferenceservice.yaml +++ b/config/configmap/inferenceservice.yaml @@ -102,3 +102,8 @@ data: { "defaultDeploymentMode": "Serverless" } + metricsAggregator: \|- + { + "enableMetricAggregation": "false", + "enablePrometheusScraping" : "false" + } diff --git a/config/overlays/test/configmap/inferenceservice.yaml b/config/overlays/test/configmap/inferenceservice.yaml index 71f2c5fb57f..ea3bfa41e4e 100644 --- a/config/overlays/test/configmap/inferenceservice.yaml +++ b/config/overlays/test/configmap/inferenceservice.yaml @@ -71,3 +71,8 @@ data: "cpuRequest": "100m", "cpuLimit": "300m" } + metricsAggregator: \|- + { + "enableMetricAggregation": "false", + "enablePrometheusScraping" : "false" + } diff --git a/docs/samples/v1beta1/tensorflow/tensorflow.yaml b/docs/samples/v1beta1/tensorflow/tensorflow.yaml index c2de3a591b6..08ec9bfe782 100644 --- a/docs/samples/v1beta1/tensorflow/tensorflow.yaml +++ b/docs/samples/v1beta1/tensorflow/tensorflow.yaml @@ -2,6 +2,9 @@ apiVersion: "serving.kserve.io/v1beta1" kind: "InferenceService" metadata: name: "flower-sample" + annotations: + serving.kserve.io/enable-metric-aggregation: "true" + serving.kserve.io/enable-prometheus-scraping: "true" spec: predictor: tensorflow: diff --git a/go.mod b/go.mod index 8a40a1d0ff2..c2d8ae09a1b 100644 --- a/go.mod +++ b/go.mod @@ -12,6 +12,7 @@ require ( github.com/gogo/protobuf v1.3.2 github.com/golang/protobuf v1.5.2 github.com/google/go-cmp v0.5.8 + github.com/google/martian v2.1.0+incompatible github.com/google/uuid v1.3.0 github.com/googleapis/google-cloud-go-testing v0.0.0-20210719221736-1c9a4c676720 github.com/json-iterator/go v1.1.12 @@ -25,7 +26,9 @@ require ( github.com/stretchr/testify v1.7.0 github.com/tidwall/gjson v1.14.1 go.uber.org/zap v1.19.1 + gomodules.xyz/jsonpatch/v2 v2.2.0 google.golang.org/api v0.93.0 + google.golang.org/protobuf v1.28.1 istio.io/api v0.0.0-20200715212100-dbf5277541ef istio.io/client-go v0.0.0-20201005161859-d8818315d678 k8s.io/api v0.23.9 @@ -105,11 +108,9 @@ require ( golang.org/x/time v0.0.0-20220224211638-0e9765cccd65 // indirect golang.org/x/tools v0.1.9 // indirect golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect - gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20220815135757-37a418bb8959 // indirect google.golang.org/grpc v1.48.0 // indirect - google.golang.org/protobuf v1.28.1 // indirect gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/hack/image_patch_dev.sh b/hack/image_patch_dev.sh index da1a0a8a694..8ccfd887a41 100755 --- a/hack/image_patch_dev.sh +++ b/hack/image_patch_dev.sh @@ -77,4 +77,9 @@ data: "cpuRequest": "100m", "cpuLimit": "100m" } + metricsAggregator: \|- + { + "enableMetricAggregation": "false", + "enablePrometheusScraping" : "false" + } EOF diff --git a/pkg/apis/serving/v1beta1/configmap.go b/pkg/apis/serving/v1beta1/configmap.go index 5ce04350834..fa6c82fe48e 100644 --- a/pkg/apis/serving/v1beta1/configmap.go +++ b/pkg/apis/serving/v1beta1/configmap.go @@ -108,11 +108,11 @@ func NewIngressConfig(cli client.Client) (IngressConfig, error) { if ingress, ok := configMap.Data[IngressConfigKeyName]; ok { err := json.Unmarshal([]byte(ingress), &ingressConfig) if err != nil { - return nil, fmt.Errorf("Unable to parse ingress config json: %v", err) + return nil, fmt.Errorf("unable to parse ingress config json: %v", err) } if ingressConfig.IngressGateway == "" \|\| ingressConfig.IngressServiceName == "" { - return nil, fmt.Errorf("Invalid ingress config, ingressGateway, ingressService are required.") + return nil, fmt.Errorf("invalid ingress config - ingressGateway and ingressService are required") } } diff --git a/pkg/constants/constants.go b/pkg/constants/constants.go index 215242fa0b5..ffb732c0e4f 100644 --- a/pkg/constants/constants.go +++ b/pkg/constants/constants.go @@ -78,13 +78,14 @@ var ( MaxScaleAnnotationKey = KnativeAutoscalingAPIGroupName + "/maxScale" RollOutDurationAnnotationKey = KnativeServingAPIGroupName + "/rollout-duration" EnableMetricAggregation = KServeAPIGroupName + "/enable-metric-aggregation" - SetPrometheusAggregateAnnotation = KServeAPIGroupName + "/enable-prometheus-aggregate-scraping" + SetPrometheusAnnotation = KServeAPIGroupName + "/enable-prometheus-scraping" KserveContainerPrometheusPortKey = "prometheus.kserve.io/port" KServeContainerPrometheusPathKey = "prometheus.kserve.io/path" PrometheusPortAnnotationKey = "prometheus.io/port" PrometheusPathAnnotationKey = "prometheus.io/path" DefaultPrometheusPath = "/metrics" QueueProxyAggregatePrometheusMetricsPort = "9088" + DefaultPodPrometheusPort = "9090" ) // InferenceService Internal Annotations diff --git a/pkg/webhook/admission/pod/agent_injector.go b/pkg/webhook/admission/pod/agent_injector.go index a9224b778d9..a411a6afcf6 100644 --- a/pkg/webhook/admission/pod/agent_injector.go +++ b/pkg/webhook/admission/pod/agent_injector.go @@ -71,10 +71,11 @@ func getAgentConfigs(configMap v1.ConfigMap) (AgentConfig, error) { if agentConfigValue, ok := configMap.Data[constants.AgentConfigMapKeyName]; ok { err := json.Unmarshal([]byte(agentConfigValue), &agentConfig) if err != nil { - panic(fmt.Errorf("Unable to unmarshall agent json string due to %v ", err)) + panic(fmt.Errorf("unable to unmarshall agent json string due to %v", err)) } } - //Ensure that we set proper values for CPU/Memory Limit/Request + + //Ensure that we set proper values resourceDefaults := []string{agentConfig.MemoryRequest, agentConfig.MemoryLimit, agentConfig.CpuRequest, @@ -82,7 +83,7 @@ func getAgentConfigs(configMap v1.ConfigMap) (AgentConfig, error) { for _, key := range resourceDefaults { _, err := resource.ParseQuantity(key) if err != nil { - return agentConfig, fmt.Errorf("Failed to parse resource configuration for %q: %q", + return agentConfig, fmt.Errorf("failed to parse resource configuration for %q: %s", constants.AgentConfigMapKeyName, err.Error()) } } diff --git a/pkg/webhook/admission/pod/metrics_aggregate_injector.go b/pkg/webhook/admission/pod/metrics_aggregate_injector.go index ddc707a06f0..3a5d6fa3569 100644 --- a/pkg/webhook/admission/pod/metrics_aggregate_injector.go +++ b/pkg/webhook/admission/pod/metrics_aggregate_injector.go @@ -17,46 +17,94 @@ limitations under the License. package pod import ( + "encoding/json" + "fmt" "github.com/kserve/kserve/pkg/constants" v1 "k8s.io/api/core/v1" ) -const defaultPrometheusPort = "8080" +const ( + defaultKserveContainerPrometheusPort = "8080" + MetricsAggregatorConfigMapKeyName = "metricsAggregator" +) -// InjectMetricsAggregator looks for the annotations to enable aggregate kserve-container and queue-proxy metrics and -// if specified, sets port-related EnvVars in queue-proxy and the aggregate prometheus annotation. -func InjectMetricsAggregator(pod v1.Pod) error { +type MetricsAggregator struct { + EnableMetricAggregation string `json:"enableMetricAggregation"` + EnablePrometheusScraping string `json:"enablePrometheusScraping"` +} + +func newMetricsAggregator(configMap v1.ConfigMap) (MetricsAggregator, error) { + ma := &MetricsAggregator{} + + if maConfigVal, ok := configMap.Data[MetricsAggregatorConfigMapKeyName]; ok { + err := json.Unmarshal([]byte(maConfigVal), &ma) + if err != nil { + panic(fmt.Errorf("Unable to unmarshall %v json string due to %v ", MetricsAggregatorConfigMapKeyName, err)) + } + } + + return ma, nil +} + +func setMetricAggregationEnvVars(pod v1.Pod) { for i, container := range pod.Spec.Containers { if container.Name == "queue-proxy" { - if enableMetricAgg, ok := pod.ObjectMeta.Annotations[constants.EnableMetricAggregation]; ok && enableMetricAgg == "true" { - // The kserve-container prometheus port/path is inherited from the ClusterServingRuntime YAML. - // If no port is defined (transformer using python SDK), use the default port/path for the kserve-container. - kserveContainerPromPort := defaultPrometheusPort - if port, ok := pod.ObjectMeta.Annotations[constants.KserveContainerPrometheusPortKey]; ok { - kserveContainerPromPort = port - } - - kserveContainerPromPath := constants.DefaultPrometheusPath - if path, ok := pod.ObjectMeta.Annotations[constants.KServeContainerPrometheusPathKey]; ok { - kserveContainerPromPath = path - } - - // The kserve container port/path is set as an EnvVar in the queue-proxy container - // so that it knows which port/path to scrape from the kserve-container. - pod.Spec.Containers[i].Env = append(pod.Spec.Containers[i].Env, v1.EnvVar{Name: constants.KServeContainerPrometheusMetricsPortEnvVarKey, Value: kserveContainerPromPort}) - pod.Spec.Containers[i].Env = append(pod.Spec.Containers[i].Env, v1.EnvVar{Name: constants.KServeContainerPrometheusMetricsPathEnvVarKey, Value: kserveContainerPromPath}) - - // Set the port that queue-proxy will use to expose the aggregate metrics. - pod.Spec.Containers[i].Env = append(pod.Spec.Containers[i].Env, v1.EnvVar{Name: constants.QueueProxyAggregatePrometheusMetricsPortEnvVarKey, Value: constants.QueueProxyAggregatePrometheusMetricsPort}) - - // If SetPrometheusAggregateAnnotation is true, the pod annotations for prometheus port and path will be set. The scrape annotation is not set, - // that is left for the user to configure. - if setPromAnnotation, ok := pod.ObjectMeta.Annotations[constants.SetPrometheusAggregateAnnotation]; ok && setPromAnnotation == "true" { - pod.ObjectMeta.Annotations[constants.PrometheusPortAnnotationKey] = constants.QueueProxyAggregatePrometheusMetricsPort - pod.ObjectMeta.Annotations[constants.PrometheusPathAnnotationKey] = constants.DefaultPrometheusPath - } + // The kserve-container prometheus port/path is inherited from the ClusterServingRuntime YAML. + // If no port is defined (transformer using python SDK), use the default port/path for the kserve-container. + kserveContainerPromPort := defaultKserveContainerPrometheusPort + if port, ok := pod.ObjectMeta.Annotations[constants.KserveContainerPrometheusPortKey]; ok { + kserveContainerPromPort = port } + + kserveContainerPromPath := constants.DefaultPrometheusPath + if path, ok := pod.ObjectMeta.Annotations[constants.KServeContainerPrometheusPathKey]; ok { + kserveContainerPromPath = path + } + + // The kserve container port/path is set as an EnvVar in the queue-proxy container + // so that it knows which port/path to scrape from the kserve-container. + pod.Spec.Containers[i].Env = append(pod.Spec.Containers[i].Env, v1.EnvVar{Name: constants.KServeContainerPrometheusMetricsPortEnvVarKey, Value: kserveContainerPromPort}) + pod.Spec.Containers[i].Env = append(pod.Spec.Containers[i].Env, v1.EnvVar{Name: constants.KServeContainerPrometheusMetricsPathEnvVarKey, Value: kserveContainerPromPath}) + + // Set the port that queue-proxy will use to expose the aggregate metrics. + pod.Spec.Containers[i].Env = append(pod.Spec.Containers[i].Env, v1.EnvVar{Name: constants.QueueProxyAggregatePrometheusMetricsPortEnvVarKey, Value: constants.QueueProxyAggregatePrometheusMetricsPort}) + + } + } +} + +// InjectMetricsAggregator looks for the annotations to enable aggregate kserve-container and queue-proxy metrics and +// if specified, sets port-related EnvVars in queue-proxy and the aggregate prometheus annotation. +func (ma MetricsAggregator) InjectMetricsAggregator(pod v1.Pod) error { + //Only set metric configs if the required annotations are set + enableMetricAggregation, ok := pod.ObjectMeta.Annotations[constants.EnableMetricAggregation] + if !ok { + if pod.ObjectMeta.Annotations == nil { + pod.ObjectMeta.Annotations = make(map[string]string) } + pod.ObjectMeta.Annotations[constants.EnableMetricAggregation] = ma.EnableMetricAggregation + enableMetricAggregation = ma.EnableMetricAggregation + } + if enableMetricAggregation == "true" { + setMetricAggregationEnvVars(pod) + } + + // Handle setting the pod prometheus annotations + setPromAnnotation, ok := pod.ObjectMeta.Annotations[constants.SetPrometheusAnnotation] + if !ok { + pod.ObjectMeta.Annotations[constants.SetPrometheusAnnotation] = ma.EnablePrometheusScraping + setPromAnnotation = ma.EnablePrometheusScraping } + if setPromAnnotation == "true" { + // Set prometheus port to default queue proxy prometheus metrics port. + // If enableMetricAggregation is true, set it as the queue proxy metrics aggregation port. + podPromPort := constants.DefaultPodPrometheusPort + if enableMetricAggregation == "true" { + podPromPort = constants.QueueProxyAggregatePrometheusMetricsPort + } + pod.ObjectMeta.Annotations[constants.PrometheusPortAnnotationKey] = podPromPort + pod.ObjectMeta.Annotations[constants.PrometheusPathAnnotationKey] = constants.DefaultPrometheusPath + } + return nil } diff --git a/pkg/webhook/admission/pod/metrics_aggregate_injector_test.go b/pkg/webhook/admission/pod/metrics_aggregate_injector_test.go index 72b266b502a..e1a0a3b99f0 100644 --- a/pkg/webhook/admission/pod/metrics_aggregate_injector_test.go +++ b/pkg/webhook/admission/pod/metrics_aggregate_injector_test.go @@ -95,7 +95,7 @@ func TestInjectMetricsAggregator(t testing.T) { Name: "deployment", Namespace: "default", Annotations: map[string]string{ - constants.EnableMetricAggregation: "true", + constants.EnableMetricAggregation: "false", }, }, Spec: v1.PodSpec{ @@ -147,14 +147,14 @@ func TestInjectMetricsAggregator(t testing.T) { }, }, }, - "setPromAnnotationTrue": { + "setPromAnnotationTrueWithAggTrue": { original: &v1.Pod{ ObjectMeta: metav1.ObjectMeta{ Name: "deployment", Namespace: "default", Annotations: map[string]string{ - constants.EnableMetricAggregation: "true", - constants.SetPrometheusAggregateAnnotation: "true", + constants.EnableMetricAggregation: "true", + constants.SetPrometheusAnnotation: "true", }, }, Spec: v1.PodSpec{ @@ -172,10 +172,10 @@ func TestInjectMetricsAggregator(t testing.T) { Name: "deployment", Namespace: "default", Annotations: map[string]string{ - constants.EnableMetricAggregation: "true", - constants.SetPrometheusAggregateAnnotation: "true", - constants.PrometheusPortAnnotationKey: constants.QueueProxyAggregatePrometheusMetricsPort, - constants.PrometheusPathAnnotationKey: constants.DefaultPrometheusPath, + constants.EnableMetricAggregation: "true", + constants.SetPrometheusAnnotation: "true", + constants.PrometheusPortAnnotationKey: constants.QueueProxyAggregatePrometheusMetricsPort, + constants.PrometheusPathAnnotationKey: constants.DefaultPrometheusPath, }, }, Spec: v1.PodSpec{ @@ -194,14 +194,56 @@ func TestInjectMetricsAggregator(t testing.T) { }, }, }, + "setPromAnnotationTrueWithAggFalse": { + original: &v1.Pod{ + ObjectMeta: metav1.ObjectMeta{ + Name: "deployment", + Namespace: "default", + Annotations: map[string]string{ + constants.EnableMetricAggregation: "false", + constants.SetPrometheusAnnotation: "true", + }, + }, + Spec: v1.PodSpec{ + Containers: []v1.Container{{ + Name: "sklearn", + }, + { + Name: "queue-proxy", + }, + }, + }, + }, + expected: &v1.Pod{ + ObjectMeta: metav1.ObjectMeta{ + Name: "deployment", + Namespace: "default", + Annotations: map[string]string{ + constants.EnableMetricAggregation: "false", + constants.SetPrometheusAnnotation: "true", + constants.PrometheusPortAnnotationKey: constants.DefaultPodPrometheusPort, + constants.PrometheusPathAnnotationKey: constants.DefaultPrometheusPath, + }, + }, + Spec: v1.PodSpec{ + Containers: []v1.Container{{ + Name: "sklearn", + }, + { + Name: "queue-proxy", + }, + }, + }, + }, + }, "SetPromAnnotationFalse": { original: &v1.Pod{ ObjectMeta: metav1.ObjectMeta{ Name: "deployment", Namespace: "default", Annotations: map[string]string{ - constants.EnableMetricAggregation: "true", - constants.SetPrometheusAggregateAnnotation: "false", + constants.EnableMetricAggregation: "true", + constants.SetPrometheusAnnotation: "false", }, }, Spec: v1.PodSpec{ @@ -219,8 +261,8 @@ func TestInjectMetricsAggregator(t testing.T) { Name: "deployment", Namespace: "default", Annotations: map[string]string{ - constants.EnableMetricAggregation: "true", - constants.SetPrometheusAggregateAnnotation: "false", + constants.EnableMetricAggregation: "true", + constants.SetPrometheusAnnotation: "false", }, }, Spec: v1.PodSpec{ @@ -241,11 +283,14 @@ func TestInjectMetricsAggregator(t testing.T) { }, } + cfgMap := v1.ConfigMap{Data: map[string]string{"enableMetricAggregation": "false", "enablePrometheusScraping": "false"}} + ma, err := newMetricsAggregator(&cfgMap) + if err != nil { + t.Errorf("Error creating the metrics aggregator %v", err) + } + for name, scenario := range scenarios { - err := InjectMetricsAggregator(scenario.original) - if err != nil { - t.Errorf("Test %q unexpected error %e", name, err) - } + ma.InjectMetricsAggregator(scenario.original) if diff, _ := kmp.SafeDiff(scenario.expected.Spec, scenario.original.Spec); diff != "" { t.Errorf("Test %q unexpected result (-want +got): %v", name, diff) } diff --git a/pkg/webhook/admission/pod/mutator.go b/pkg/webhook/admission/pod/mutator.go index d5352c4a2eb..c320967f3c1 100644 --- a/pkg/webhook/admission/pod/mutator.go +++ b/pkg/webhook/admission/pod/mutator.go @@ -111,11 +111,16 @@ func (mutator Mutator) mutate(pod v1.Pod, configMap v1.ConfigMap) error { batcherConfig: batcherConfig, } + metricsAggregator, err := newMetricsAggregator(configMap) + if err != nil { + return err + } + mutators := []func(pod v1.Pod) error{ InjectGKEAcceleratorSelector, storageInitializer.InjectStorageInitializer, agentInjector.InjectAgent, - InjectMetricsAggregator, + metricsAggregator.InjectMetricsAggregator, } for _, mutator := range mutators { diff --git a/pkg/webhook/admission/pod/mutator_test.go b/pkg/webhook/admission/pod/mutator_test.go index fe3b58a65a1..0a7d8066499 100644 --- a/pkg/webhook/admission/pod/mutator_test.go +++ b/pkg/webhook/admission/pod/mutator_test.go @@ -15,6 +15,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/webhook/admission" + "sort" "testing" ) @@ -255,8 +256,16 @@ func TestMutator_Handle(t testing.T) { }, }, }, - matcher: gomega.Equal(admission.Response{ + matcher: gomega.BeEquivalentTo(admission.Response{ Patches: []jsonpatch.JsonPatchOperation{ + { + Operation: "add", + Path: "/metadata/annotations", + Value: map[string]interface{}{ + "serving.kserve.io/enable-metric-aggregation": "", + "serving.kserve.io/enable-prometheus-scraping": "", + }, + }, { Operation: "add", Path: "/metadata/namespace", @@ -287,11 +296,21 @@ func TestMutator_Handle(t testing.T) { } tc.request.Object.Raw = byteData res := mutator.Handle(context.TODO(), tc.request) + sortPatches(res.Patches) g.Expect(res).Should(tc.matcher) if err := c.Delete(context.TODO(), &tc.configMap); err != nil { t.Errorf("failed to delete configmap %v", err) } }) } +} +// sortPatches sorts the slice of patches by Path so that the comparison works +// when there are > 1 patches. Note: make sure the matcher Patches are sorted. +func sortPatches(patches []jsonpatch.JsonPatchOperation) { + if len(patches) > 1 { + sort.Slice(patches, func(i, j int) bool { + return patches[i].Path < patches[j].Path + }) + } } diff --git a/python/kserve/requirements.txt b/python/kserve/requirements.txt index 8a2f9521d4e..216c63dc0a1 100644 --- a/python/kserve/requirements.txt +++ b/python/kserve/requirements.txt @@ -22,4 +22,4 @@ tritonclient==2.18.0 protobuf~=3.19.0 prometheus-client>=0.13.1 orjson>=3.8.0 -httpx>=0.23.0 \ No newline at end of file +httpx>=0.23.0 diff --git a/python/kserve/setup.py b/python/kserve/setup.py index 933fbccdef6..9837a1b9c67 100644 --- a/python/kserve/setup.py +++ b/python/kserve/setup.py @@ -21,7 +21,8 @@ 'pytest-cov', 'pytest-asyncio', 'pytest-tornasync', - 'mypy' + 'mypy', + 'portforward', ] with open('requirements.txt') as f: diff --git a/qpext/README.md b/qpext/README.md new file mode 100644 index 00000000000..3f977aa4692 --- /dev/null +++ b/qpext/README.md @@ -0,0 +1,197 @@ +# Queue Proxy Extension + +## What qpext does +This directory handles extending the Knative queue-proxy sidecar container. + +The qpext creates a new port in the queue-proxy container that scrapes Prometheus metrics from both `queue-proxy` and `kserve-container`. +When the new aggregate metrics endpoint is hit, the response will contain metrics from both `queue-proxy` and `kserve-container`. +The qpext adds the functionality to emit metrics from both containers on a single endpoint. + +## Why qpext is needed +If an InferenceService uses Knative, then it has at least two containers in one pod, `queue-proxy` and `kserve-container`. A limitation of using Prometheus is that it supports scraping only one endpoint in the pod. +When there are multiple containers in a pod that emit Prometheus metrics, this becomes an issue (see [Prometheus for multiple port annotations issue #3756](https://github.com/prometheus/prometheus/issues/3756) for the +full discussion on this topic). In an attempt to make an easy-to-use solution, the queue-proxy is extended to handle this use case. + + +see also: [KServe Issue #2645](https://github.com/kserve/kserve/issues/2465), + +## How to use + +Save this file as qpext_image_patch.yaml, update the tag if needed. +```yaml +data: + queueSidecarImage: kserve/qpext:latest +``` + +Run the following command to patch the deployment config in the appropriate knative namespace. +```shell +kubectl patch configmaps -n knative-serving config-deployment --patch-file qpext_image_patch.yaml +``` + +## Configs + +The qpext relies on pod annotations to be set in the InferenceService YAML. If these annotations are set to true, then environment variables will be added to the queue-proxy container. +The qpext uses the environment variables to configure which port/path to expose metrics on and which port/path to scrape metrics from in `queue-proxy` and `kserve-container`. + +\| Annotation \| Default \| Description \| +\|------------------------------------------------------\|---------\|-------------\| +\| serving.kserve.io/enable-metric-aggregation \| false \| If true, enables metric aggregation in queue-proxy by setting env vars in the queue proxy container to configure scraping ports. \| +\| serving.kserve.io/enable-prometheus-scraping \| false \| If true, sets the prometheus annotations in the pod. If true and "serving.kserve.io/enable-metric-aggregation" is false, the prometheus port will be set as the default queue-proxy port. If both are true, the prometheus port annotation will be set as the aggregate metric port. \| + + +\| Queue Proxy Env Vars \| Default \| Description \| +\|------------------------------------------\|----------\|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------\| +\| AGGREGATE_PROMETHEUS_METRICS_PORT \| 9088 \| The metrics aggregation port in queue-proxy that is added in the qpext. \| +\| KSERVE_CONTAINER_PROMETHEUS_METRICS_PORT \| 8080 \| The default metrics port for the `kserve-container`. If present, the default ClusterServingRuntime overrides this value with each runtime's default prometheus port. \| +\| KSERVE_CONTAINER_PROMETHEUS_METRICS_PATH \| /metrics \| The default metrics path for the `kserve-container`. If present, the default ClusterServingRuntime annotation overrides this value with each runtime's default prometheus path. \| + +To implement this feature, configure the InferenceService YAML annotations. + +```yaml +apiVersion: "serving.kserve.io/v1beta1" +kind: "InferenceService" +metadata: + name: "sklearn-irisv2" + annotations: + serving.kserve.io/enable-metric-aggregation: "true" + serving.kserve.io/enable-prometheus-scraping: "true" +spec: + predictor: + sklearn: + protocolVersion: v2 + storageUri: "gs://seldon-models/sklearn/iris" +``` + +To view the runtime specific defaults for the `kserve-container` prometheus port and path, view the spec annotations in `kserve/config/runtimes`. +These values can be overriden in the InferenceService YAML annotations. + +```yaml +apiVersion: "serving.kserve.io/v1beta1" +kind: "InferenceService" +metadata: + name: "sklearn-irisv2" + annotations: + serving.kserve.io/enable-metric-aggregation: "true" + serving.kserve.io/enable-prometheus-scraping: "true" + prometheus.kserve.io/port: '8081' + prometheus.kserve.io/path: "/other/metrics" +spec: + predictor: + sklearn: + protocolVersion: v2 + storageUri: "gs://seldon-models/sklearn/iris" +``` +The default port for sklearn runtime is `8080`, and the default path is `/metrics`. +By setting the annotations in the InferenceService YAML, the default runtime configurations are overridden. + +KServe Developer's Note:* If the qpext is implemented in the cluster and you wish to set the default annotation values to `true`, +the defaults in the configMap can be overridden via patching the configMap or setting up a webhook to override the values. +To check the default values in your cluster, run + +```shell +kubectl get configmaps inferenceservice-config -n kserve -oyaml +``` + +the values are in the output of the YAML like + +```yaml + metricsAggregator: \|- + { + "enableMetricAggregation": "false", + "enablePrometheusScraping" : "false" + } +``` + +If these values are overridden to default to `true` + +```yaml + metricsAggregator: \|- + { + "enableMetricAggregation": "true", + "enablePrometheusScraping" : "true" + } +``` +then the annotations should be inserted into the YAML with `false` values when +an InferenceService does not want to aggregate metrics and/or set the prometheus +scraping port annotation. + +## Developer's guide + +Changes can be made in the qpext and tested via unit tests, e2e tests, and interactively in a cluster. + +### Note on dependencies + +The controller reads the `serving.kserve.io/enable-metric-aggregation` and `serving.kserve.io/enable-prometheus-scraping` +annotations and then adds prometheus annotations to the pod and/or environment variables to the queue-proxy container if specified. +This code is found in `kserve/pkg/webhook/admission/pod/metrics_aggregate_injector.go`. + +The specific runtime default configurations are annotations in the YAML files in `kserve/config/runtimes`. + +### Test + +In kserve/qpext, run `go test -v ./... -cover` to run the unit tests and get the total coverage. +The e2e tests are defined in `kserve/test/qpext`. To add an e2e test, create a python test in this directory. + +### Build +The qpext code can be interactively tested by building the image with any changes, +pushing the image to dockerhub/container registry, and patching the knative deploy config to use +the test image. The pods will then pick up the new configuration. + + +(1) To build the qpext image in the kserve/qpext directory (as an example, `some_docker_repo` in dockerhub), run +```shell +make docker-build-push-qpext +``` + +Alternatively, build and push the image step by step yourself. +```shell +cd kserve/qpext +export QPEXT_IMG={some_docker_repo}/qpext +docker build -t ${QPEXT_IMG} -f qpext.Dockerfile . +``` + +Next push the image to a container registry, +```shell +docker push {some_docker_repo}/qpext:latest +``` + +(2) Save this file as qpext_image_patch.yaml, update the tag if needed. +```yaml +data: + queueSidecarImage: kserve/qpext:latest +``` + +(3) Run the following command to patch the deployment config in the appropriate knative namespace. +```shell +kubectl patch configmaps -n knative-serving config-deployment --patch-file qpext_image_patch.yaml +``` + +(4) Confirm the config-deployment updated +```shell +kubectl get configmaps -n knative-serving config-deployment -oyaml +``` + +(5) Deploy an InferenceService and check that the change works. + +For example, using the sklearn example above saved as `sklearn.yaml` +```shell +kubectl apply -f sklearn.yaml +``` + +To check that the configs were applied as env vars in the queue-proxy container +and annotations on the pod, check the Pod output. +```shell +kubectl get pod {name_of_pod} -oyaml +``` + +To check that the metrics are aggregated, use the KServe [Getting Started](https://kserve.github.io/website/0.9/get_started/first_isvc/#4-determine-the-ingress-ip-and-ports) +documentation as a guide to send a request to the pod. Next, send a request to the metrics endpoint. + +For example, port-forward the pod prometheus aggregate metrics port to localhost. +```shell +kubectl port-forward pods/{pod_name} 9088:9088 +``` +Next, cURL the port to see the metrics output. +```shell +curl localhost:9088 +``` diff --git a/qpext/cmd/qpext/main.go b/qpext/cmd/qpext/main.go new file mode 100644 index 00000000000..27463e76394 --- /dev/null +++ b/qpext/cmd/qpext/main.go @@ -0,0 +1,255 @@ +/* +Copyright 2022 The KServe Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +/ + +package main + +import ( + "context" + "fmt" + "github.com/hashicorp/go-multierror" + logger "github.com/kserve/kserve/qpext" + "github.com/prometheus/client_golang/prometheus" + "github.com/prometheus/common/expfmt" + "go.uber.org/zap" + "io" + "mime" + "net" + "net/http" + "os" + "strconv" + "time" +) + +import "knative.dev/serving/pkg/queue/sharedmain" + +var ( + promRegistry prometheus.Registry +) + +const ( + // aggregate scraping env vars from kserve/pkg/constants + KServeContainerPrometheusMetricsPortEnvVarKey = "KSERVE_CONTAINER_PROMETHEUS_METRICS_PORT" + KServeContainerPrometheusMetricsPathEnvVarKey = "KSERVE_CONTAINER_PROMETHEUS_METRICS_PATH" + QueueProxyAggregatePrometheusMetricsPortEnvVarKey = "AGGREGATE_PROMETHEUS_METRICS_PORT" + QueueProxyMetricsPort = "9091" + DefaultQueueProxyMetricsPath = "/metrics" + prometheusTimeoutHeader = "X-Prometheus-Scrape-Timeout-Seconds" +) + +type ScrapeConfigurations struct { + logger zap.Logger + QueueProxyPath string `json:"path"` + QueueProxyPort string `json:"port"` + AppPort string + AppPath string +} + +func getURL(port string, path string) string { + return fmt.Sprintf("http://localhost:%s%s", port, path) +} + +// getHeaderTimeout parse a string like (1.234) representing number of seconds +func getHeaderTimeout(timeout string) (time.Duration, error) { + timeoutSeconds, err := strconv.ParseFloat(timeout, 64) + if err != nil { + return 0 time.Second, err + } + + return time.Duration(timeoutSeconds * 1e9), nil +} + +func applyHeaders(into http.Header, from http.Header, keys ...string) { + for _, key := range keys { + val := from.Get(key) + if val != "" { + into.Set(key, val) + } + } +} + +func negotiateMetricsFormat(contentType string) expfmt.Format { + mediaType, _, err := mime.ParseMediaType(contentType) + if err == nil && mediaType == expfmt.OpenMetricsType { + return expfmt.FmtOpenMetrics + } + return expfmt.FmtText +} + +// scrapeAndWriteAgentMetrics gathers a slice of prometheus metric families and encodes the metrics. +func scrapeAndWriteAgentMetrics(w io.Writer) error { + mfs, err := promRegistry.Gather() + if err != nil { + return err + } + enc := expfmt.NewEncoder(w, expfmt.FmtText) + var errs error + for _, mf := range mfs { + if err = enc.Encode(mf); err != nil { + errs = multierror.Append(errs, err) + } + } + return errs +} + +// scrape sends a request to the provided url to scrape metrics from +// This will attempt to mimic some of Prometheus functionality by passing some headers through +// scrape returns the scraped metrics reader as well as the response's "Content-Type" header to determine the metrics format +func scrape(url string, header http.Header, logger zap.Logger) (io.ReadCloser, context.CancelFunc, string, error) { + var cancel context.CancelFunc + ctx := context.Background() + if timeoutString := header.Get(prometheusTimeoutHeader); timeoutString != "" { + timeout, err := getHeaderTimeout(timeoutString) + if err != nil { + logger.Error("Failed to parse timeout header", zap.Error(err), zap.String("timeout", timeoutString)) + } else { + ctx, cancel = context.WithTimeout(ctx, timeout) + defer cancel() + } + } + req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil) + if err != nil { + return nil, cancel, "", err + } + + applyHeaders(req.Header, header, "Accept", + "User-Agent", + prometheusTimeoutHeader, + ) + + resp, err := http.DefaultClient.Do(req) + if err != nil { + return nil, cancel, "", fmt.Errorf("error scraping %s: %v", url, err) + } + if resp.StatusCode != http.StatusOK { + return nil, cancel, "", fmt.Errorf("error scraping %s, status code: %v", url, resp.StatusCode) + } + format := resp.Header.Get("Content-Type") + return resp.Body, cancel, format, nil +} + +func NewScrapeConfigs(logger zap.Logger, queueProxyPort string, appPort string, appPath string) ScrapeConfigurations { + return &ScrapeConfigurations{ + logger: logger, + QueueProxyPath: DefaultQueueProxyMetricsPath, + QueueProxyPort: queueProxyPort, + AppPort: appPort, + AppPath: appPath, + } +} + +func (sc ScrapeConfigurations) handleStats(w http.ResponseWriter, r http.Request) { + var err error + var queueProxy, application io.ReadCloser + var queueProxyCancel, appCancel context.CancelFunc + + defer func() { + if application != nil { + application.Close() + } + if queueProxyCancel != nil { + queueProxyCancel() + } + if appCancel != nil { + appCancel() + } + }() + + // Gather all the metrics we will merge + if sc.QueueProxyPort != "" { + queueProxyURL := getURL(sc.QueueProxyPort, sc.QueueProxyPath) + if queueProxy, queueProxyCancel, _, err = scrape(queueProxyURL, r.Header, sc.logger); err != nil { + sc.logger.Error("failed scraping envoy metrics", zap.Error(err)) + } + } + + // Scrape app metrics if defined and capture their format + var format expfmt.Format + if sc.AppPort != "" { + kserveContainerURL := getURL(sc.AppPort, sc.AppPath) + var contentType string + if application, appCancel, contentType, err = scrape(kserveContainerURL, r.Header, sc.logger); err != nil { + sc.logger.Error("failed scraping application metrics", zap.Error(err)) + } + format = negotiateMetricsFormat(contentType) + } else { + // Without app metrics format use a default + format = expfmt.FmtText + } + + w.Header().Set("Content-Type", string(format)) + + // Write out the metrics + if err = scrapeAndWriteAgentMetrics(io.Writer(w)); err != nil { + sc.logger.Error("failed scraping and writing agent metrics", zap.Error(err)) + } + + if queueProxy != nil { + _, err = io.Copy(w, queueProxy) + if err != nil { + sc.logger.Error("failed to scraping and writing queue proxy metrics", zap.Error(err)) + } + } + + // App metrics must go last because if they are FmtOpenMetrics, + // they will have a trailing "# EOF" which terminates the full exposition + if application != nil { + _, err = io.Copy(w, application) + if err != nil { + sc.logger.Error("failed to scraping and writing application metrics", zap.Error(err)) + } + } +} + +func main() { + zapLogger := logger.InitializeLogger() + promRegistry = prometheus.NewRegistry() + mux := http.NewServeMux() + ctx := context.Background() + sc := NewScrapeConfigs( + zapLogger, + QueueProxyMetricsPort, + os.Getenv(KServeContainerPrometheusMetricsPortEnvVarKey), + os.Getenv(KServeContainerPrometheusMetricsPathEnvVarKey), + ) + mux.HandleFunc(`/metrics`, sc.handleStats) + l, err := net.Listen("tcp", fmt.Sprintf(":%v", os.Getenv(QueueProxyAggregatePrometheusMetricsPortEnvVarKey))) + if err != nil { + zapLogger.Error("error listening on status port", zap.Error(err)) + return + } + + defer l.Close() + + go func() { + if err = http.Serve(l, mux); err != nil { + zapLogger.Error("error serving aggregate metrics", zap.Error(err)) + fmt.Println(err) + select { + case <-ctx.Done(): + // We are shutting down already, don't trigger SIGTERM + return + default: + } + } + }() + zapLogger.Info("Stats server has successfully started") + if sharedmain.Main() != nil { + os.Exit(1) + } + // Wait for the agent to be shut down. + <-ctx.Done() + zapLogger.Info("Stats server has successfully terminated") +} diff --git a/qpext/cmd/qpext/main_test.go b/qpext/cmd/qpext/main_test.go new file mode 100644 index 00000000000..485844707bd --- /dev/null +++ b/qpext/cmd/qpext/main_test.go @@ -0,0 +1,233 @@ +/ +Copyright 2022 The KServe Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +/ + +package main + +import ( + logger "github.com/kserve/kserve/qpext" + "github.com/prometheus/client_golang/prometheus" + "github.com/prometheus/common/expfmt" + "github.com/stretchr/testify/assert" + "net/http" + "net/http/httptest" + "strings" + "testing" +) + +func TestGetHeaderTimeout(t testing.T) { + inputs := []string{"1.23", "100", "notvalid", "12.wrong"} + errIsNil := []bool{true, true, false, false} + + for i, input := range inputs { + _, err := getHeaderTimeout(input) + if errIsNil[i] == true { + assert.NoError(t, err) + } else { + assert.Error(t, err) + } + } +} + +func TestNegotiateMetricsFromat(t testing.T) { + contentTypes := []string{"", "random", "text/plain;version=0.0.4;q=0.5,/;q=0.1", `application/openmetrics-text; version=1.0.0; charset=utf-8`} + expected := []expfmt.Format{expfmt.FmtText, expfmt.FmtText, expfmt.FmtText, expfmt.FmtOpenMetrics} + + for i, contentType := range contentTypes { + result := negotiateMetricsFormat(contentType) + assert.Equal(t, expected[i], result) + } +} + +func TestScrapeHeaders(t testing.T) { + metricExample := `# TYPE my_metric counter + my_metric{} 0 + ` + timeoutHeader := "X-Prometheus-Scrape-Timeout-Seconds" + tests := []struct { + name string + headerVal string + expectNilCancel bool + }{ + { + name: "timeout header parses", + headerVal: "10", + }, + { + name: "timeout header invalid", + headerVal: "invalid", + expectNilCancel: true, + }, + } + + zapLogger := logger.InitializeLogger() + for _, test := range tests { + t.Run(test.name, func(t testing.T) { + promRegistry = prometheus.NewRegistry() + qp := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r http.Request) { + _, err := w.Write([]byte(metricExample)) + assert.NoError(t, err) + })) + defer qp.Close() + + url := getURL(strings.Split(qp.URL, ":")[2], "/metrics") + + req := &http.Request{ + Header: map[string][]string{timeoutHeader: {test.headerVal}}, + } + queueProxy, queueProxyCancel, _, err := scrape(url, req.Header, zapLogger) + assert.NoError(t, err) + assert.NotNil(t, queueProxy) + if test.expectNilCancel { + assert.Nil(t, queueProxyCancel) + } else { + assert.NotNil(t, queueProxyCancel) + } + }) + } +} + +func TestScrapeErr(t testing.T) { + metricExample := `# TYPE my_metric counter + my_metric{} 0 + ` + zapLogger := logger.InitializeLogger() + promRegistry = prometheus.NewRegistry() + qp := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r http.Request) { + _, err := w.Write([]byte(metricExample)) + assert.NoError(t, err) + })) + defer qp.Close() + + url := "not-a-real-url" + + req := &http.Request{} + queueProxy, _, _, err := scrape(url, req.Header, zapLogger) + assert.Error(t, err) + assert.Nil(t, queueProxy) +} + +func TestHandleStats(t testing.T) { + metricExample := `# TYPE my_metric counter + my_metric{} 0 + ` + otherMetricExample := `# TYPE my_other_metric counter + my_other_metric{} 0 + ` + tests := []struct { + name string + queueproxy string + app string + output string + expectParseError bool + }{ + { + name: "queueproxy metric only", + queueproxy: metricExample, + output: metricExample, + }, + { + name: "app metric only", + app: metricExample, + output: metricExample, + }, + { + name: "multiple metric", + queueproxy: metricExample, + app: otherMetricExample, + output: metricExample + otherMetricExample, + }, + // when app and queueproxy share a metric, Prometheus will fail. + { + name: "conflict metric", + queueproxy: metricExample + otherMetricExample, + app: metricExample, + output: metricExample + otherMetricExample + metricExample, + expectParseError: true, + }, + } + + zapLogger := logger.InitializeLogger() + for _, test := range tests { + t.Run(test.name, func(t testing.T) { + promRegistry = prometheus.NewRegistry() + rec := httptest.NewRecorder() + qp := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r http.Request) { + _, err := w.Write([]byte(test.queueproxy)) + assert.NoError(t, err) + })) + defer qp.Close() + + app := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r http.Request) { + _, err := w.Write([]byte(test.app)) + assert.NoError(t, err) + })) + defer app.Close() + + psc := &ScrapeConfigurations{ + logger: zapLogger, + QueueProxyPort: strings.Split(qp.URL, ":")[2], + AppPort: strings.Split(app.URL, ":")[2], + } + req := &http.Request{} + psc.handleStats(rec, req) + assert.Equal(t, rec.Code, 200) + assert.Contains(t, rec.Body.String(), test.output) + + parser := expfmt.TextParser{} + mfMap, err := parser.TextToMetricFamilies(strings.NewReader(rec.Body.String())) + if !test.expectParseError { + assert.NoErrorf(t, err, "failed to parse metrics: %v", err) + } else if err == nil && test.expectParseError { + assert.False(t, test.expectParseError, "expected a prse error, got %+v", mfMap) + } + }) + } + +} + +func TestHandleStatsErr(t testing.T) { + zapLogger := logger.InitializeLogger() + fail := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r http.Request) { + w.WriteHeader(http.StatusInternalServerError) + })) + defer fail.Close() + pass := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r http.Request) { + w.WriteHeader(http.StatusOK) + })) + defer pass.Close() + failPort := strings.Split(fail.URL, ":")[2] + passPort := strings.Split(pass.URL, ":")[2] + + tests := []struct { + name string + queueproxy string + app string + }{ + {"both pass", passPort, passPort}, + {"queue proxy pass", passPort, failPort}, + {"app pass", failPort, passPort}, + {"both fail", failPort, failPort}, + } + for _, test := range tests { + t.Run(test.name, func(t testing.T) { + sc := NewScrapeConfigs(zapLogger, test.queueproxy, test.app, DefaultQueueProxyMetricsPath) + req := &http.Request{} + rec := httptest.NewRecorder() + sc.handleStats(rec, req) + assert.Equal(t, 200, rec.Code) + }) + } +} diff --git a/qpext/go.mod b/qpext/go.mod new file mode 100644 index 00000000000..69c46f51371 --- /dev/null +++ b/qpext/go.mod @@ -0,0 +1,79 @@ +module github.com/kserve/kserve/qpext + +go 1.18 + +require ( + github.com/hashicorp/go-multierror v1.1.1 + github.com/prometheus/client_golang v1.13.0 + github.com/prometheus/common v0.37.0 + github.com/stretchr/testify v1.7.0 + go.uber.org/zap v1.19.1 + knative.dev/serving v0.34.2 +) + +require ( + contrib.go.opencensus.io/exporter/ocagent v0.7.1-0.20200907061046-05415f1de66d // indirect + contrib.go.opencensus.io/exporter/prometheus v0.4.0 // indirect + contrib.go.opencensus.io/exporter/zipkin v0.1.2 // indirect + github.com/beorn7/perks v1.0.1 // indirect + github.com/blendle/zapdriver v1.3.1 // indirect + github.com/census-instrumentation/opencensus-proto v0.3.0 // indirect + github.com/cespare/xxhash/v2 v2.1.2 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/evanphx/json-patch/v5 v5.6.0 // indirect + github.com/go-kit/log v0.2.0 // indirect + github.com/go-logfmt/logfmt v0.5.1 // indirect + github.com/go-logr/logr v1.2.2 // indirect + github.com/gogo/protobuf v1.3.2 // indirect + github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect + github.com/golang/protobuf v1.5.2 // indirect + github.com/google/go-cmp v0.5.8 // indirect + github.com/google/go-containerregistry v0.8.1-0.20220414143355-892d7a808387 // indirect + github.com/google/gofuzz v1.2.0 // indirect + github.com/gorilla/websocket v1.4.2 // indirect + github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect + github.com/hashicorp/errwrap v1.0.0 // indirect + github.com/hashicorp/golang-lru v0.5.4 // indirect + github.com/json-iterator/go v1.1.12 // indirect + github.com/kelseyhightower/envconfig v1.4.0 // indirect + github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/openzipkin/zipkin-go v0.3.0 // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/prometheus/client_model v0.2.0 // indirect + github.com/prometheus/procfs v0.8.0 // indirect + github.com/prometheus/statsd_exporter v0.21.0 // indirect + go.opencensus.io v0.23.0 // indirect + go.uber.org/atomic v1.9.0 // indirect + go.uber.org/automaxprocs v1.4.0 // indirect + go.uber.org/multierr v1.6.0 // indirect + golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect + golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect + golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect + golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect + golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect + golang.org/x/text v0.3.7 // indirect + golang.org/x/time v0.0.0-20220224211638-0e9765cccd65 // indirect + gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect + google.golang.org/api v0.70.0 // indirect + google.golang.org/appengine v1.6.7 // indirect + google.golang.org/genproto v0.0.0-20220301145929-1ac2ace0dbf7 // indirect + google.golang.org/grpc v1.44.0 // indirect + google.golang.org/protobuf v1.28.1 // indirect + gopkg.in/inf.v0 v0.9.1 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect + k8s.io/api v0.23.9 // indirect + k8s.io/apimachinery v0.23.9 // indirect + k8s.io/client-go v0.23.9 // indirect + k8s.io/klog/v2 v2.70.2-0.20220707122935-0990e81f1a8f // indirect + k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect + knative.dev/control-protocol v0.0.0-20220818153549-f18dbde7d9bd // indirect + knative.dev/networking v0.0.0-20220818010248-e51df7cdf571 // indirect + knative.dev/pkg v0.0.0-20220818004048-4a03844c0b15 // indirect + sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect + sigs.k8s.io/yaml v1.3.0 // indirect +) diff --git a/qpext/go.sum b/qpext/go.sum new file mode 100644 index 00000000000..7d1dda53946 --- /dev/null +++ b/qpext/go.sum @@ -0,0 +1,954 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= +cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= +cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= +cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= +cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= +cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= +cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= +cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= +cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= +cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk= +cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= +cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= +cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= +cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= +cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= +cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg= +cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= +cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0= +cloud.google.com/go v0.83.0/go.mod h1:Z7MJUsANfY0pYPdw0lbnivPx4/vhy/e2FEkSkF7vAVY= +cloud.google.com/go v0.84.0/go.mod h1:RazrYuxIK6Kb7YrzzhPoLmCVzl7Sup4NrbKPg8KHSUM= +cloud.google.com/go v0.87.0/go.mod h1:TpDYlFy7vuLzZMMZ+B6iRiELaY7z/gJPaqbMx6mlWcY= +cloud.google.com/go v0.90.0/go.mod h1:kRX0mNRHe0e2rC6oNakvwQqzyDmg57xJ+SZU1eT2aDQ= +cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+YI= +cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW4= +cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc= +cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA= +cloud.google.com/go v0.100.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w99A= +cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= +cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= +cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= +cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= +cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= +cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= +cloud.google.com/go/compute v0.1.0/go.mod h1:GAesmwr110a34z04OlxYkATPBEfVhkymfTBXtfbBFow= +cloud.google.com/go/compute v1.3.0/go.mod h1:cCZiE1NHEtai4wiufUhW8I8S1JKkAnhnQJWM7YD99wM= +cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= +cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= +cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= +cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= +cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= +cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= +cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= +cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= +cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= +cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= +cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= +contrib.go.opencensus.io/exporter/ocagent v0.7.1-0.20200907061046-05415f1de66d h1:LblfooH1lKOpp1hIhukktmSAxFkqMPFk9KR6iZ0MJNI= +contrib.go.opencensus.io/exporter/ocagent v0.7.1-0.20200907061046-05415f1de66d/go.mod h1:IshRmMJBhDfFj5Y67nVhMYTTIze91RUeT73ipWKs/GY= +contrib.go.opencensus.io/exporter/prometheus v0.4.0 h1:0QfIkj9z/iVZgK31D9H9ohjjIDApI2GOPScCKwxedbs= +contrib.go.opencensus.io/exporter/prometheus v0.4.0/go.mod h1:o7cosnyfuPVK0tB8q0QmaQNhGnptITnPQB+z1+qeFB0= +contrib.go.opencensus.io/exporter/zipkin v0.1.2 h1:YqE293IZrKtqPnpwDPH/lOqTWD/s3Iwabycam74JV3g= +contrib.go.opencensus.io/exporter/zipkin v0.1.2/go.mod h1:mP5xM3rrgOjpn79MM8fZbj3gsxcuytSqtH0dxSWW1RE= +dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= +github.com/Azure/go-autorest/autorest v0.11.18/go.mod h1:dSiJPy22c3u0OtOKDNttNgqpNFY/GeWa7GH/Pz56QRA= +github.com/Azure/go-autorest/autorest/adal v0.9.13/go.mod h1:W/MM4U6nLxnIskrw4UwWzlHfGjwUS50aOsc/I3yuU8M= +github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod h1:BI0uouVdmngYNUzGWeSYnokU+TrmwEsOqdt8Y6sso74= +github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k= +github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= +github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= +github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= +github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= +github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= +github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= +github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= +github.com/Shopify/sarama v1.30.0/go.mod h1:zujlQQx1kzHsh4jfV1USnptCQrHAEZ2Hk8fTKCulPVs= +github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= +github.com/Shopify/toxiproxy/v2 v2.1.6-0.20210914104332-15ea381dcdae/go.mod h1:/cvHQkZ1fst0EmZnA5dFtiQdWCNCFYzb+uE2vqVgvx0= +github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= +github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= +github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= +github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= +github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= +github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= +github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= +github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= +github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= +github.com/blendle/zapdriver v1.3.1 h1:C3dydBOWYRiOk+B8X9IVZ5IOe+7cl+tGOexN4QqHfpE= +github.com/blendle/zapdriver v1.3.1/go.mod h1:mdXfREi6u5MArG4j9fewC+FGnXaBR+T4Ox4J2u4eHCc= +github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/census-instrumentation/opencensus-proto v0.3.0 h1:t/LhUZLVitR1Ow2YOnduCsavhwFUklBMoGVYUCqmCqk= +github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= +github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= +github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= +github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= +github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= +github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= +github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= +github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= +github.com/eapache/go-resiliency v1.2.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= +github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= +github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= +github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= +github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= +github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g= +github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= +github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= +github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= +github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= +github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/evanphx/json-patch v0.5.2/go.mod h1:ZWS5hhDbVDyob71nXKNL0+PWn6ToqBHMikGIFbs31qQ= +github.com/evanphx/json-patch v4.12.0+incompatible h1:4onqiflcdA9EOZ4RxV643DvftH5pOlLGNtQ5lPWQu84= +github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= +github.com/evanphx/json-patch/v5 v5.6.0 h1:b91NhWfaz02IuVxO9faSllyAtNXHMPkC5J8sJCLunww= +github.com/evanphx/json-patch/v5 v5.6.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4= +github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= +github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= +github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= +github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k= +github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= +github.com/getkin/kin-openapi v0.76.0/go.mod h1:660oXbgy5JFMKreazJaQTw7o+X00qeSyhcnluiMv+Xg= +github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= +github.com/go-kit/log v0.2.0 h1:7i2K3eKTos3Vc0enKCfnVcgHh2olr/MyfboYq7cAcFw= +github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= +github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= +github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= +github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= +github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNVA= +github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= +github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= +github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= +github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.2.2 h1:ahHml/yUpnlb96Rp8HCvtYVPY8ZYpxq3g7UYchIYwbs= +github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= +github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= +github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8= +github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= +github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= +github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= +github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= +github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= +github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= +github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= +github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= +github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= +github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= +github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= +github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= +github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= +github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= +github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= +github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= +github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= +github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= +github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= +github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-containerregistry v0.8.1-0.20220414143355-892d7a808387 h1:GWICy4b02s8EA1M9H5krRQ48BKpIHO5LtBBm2BQLhx0= +github.com/google/go-containerregistry v0.8.1-0.20220414143355-892d7a808387/go.mod h1:eTLvLZaEe2FoQsb25t7BLxQQryyrwHTzFfwxN87mhAw= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= +github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= +github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= +github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= +github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= +github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= +github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= +github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= +github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0= +github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0eJc8R6ouapiM= +github.com/googleapis/gnostic v0.5.1/go.mod h1:6U4PtQXGIEt/Z3h5MAT7FNofLnw9vXk2cUuW7uA/OeU= +github.com/googleapis/gnostic v0.5.5 h1:9fHAtK0uDfpveeqqo1hkEZJcFvYXAiCN3UutL8F9xHw= +github.com/googleapis/gnostic v0.5.5/go.mod h1:7+EbHbldMins07ALC74bsA81Ovc97DwqyJO1AENw9kA= +github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= +github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= +github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= +github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4= +github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM= +github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= +github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= +github.com/grpc-ecosystem/grpc-gateway v1.14.6/go.mod h1:zdiPV4Yse/1gnckTHtghG4GkDEdKCRJduHpTxT3/jcw= +github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo= +github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= +github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA= +github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= +github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= +github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc= +github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= +github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= +github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= +github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= +github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= +github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU= +github.com/jcmturner/aescts/v2 v2.0.0/go.mod h1:AiaICIRyfYg35RUkr8yESTqvSy7csK90qZ5xfvvsoNs= +github.com/jcmturner/dnsutils/v2 v2.0.0/go.mod h1:b0TnjGOvI/n42bZa+hmXL+kFJZsFT7G4t3HTlQ184QM= +github.com/jcmturner/gofork v1.0.0/go.mod h1:MK8+TM0La+2rjBD4jE12Kj1pCCxK7d2LK/UM3ncEo0o= +github.com/jcmturner/goidentity/v6 v6.0.1/go.mod h1:X1YW3bgtvwAXju7V3LCIMpY0Gbxyjn/mY9zx4tFonSg= +github.com/jcmturner/gokrb5/v8 v8.4.2/go.mod h1:sb+Xq/fTY5yktf/VxLsE3wlfPqQjp0aWNYyvBVK62bc= +github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc= +github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= +github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= +github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= +github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= +github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= +github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= +github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= +github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= +github.com/kelseyhightower/envconfig v1.4.0 h1:Im6hONhd3pLkfDFsbRgu68RDNkGF1r3dvMUtDTo2cv8= +github.com/kelseyhightower/envconfig v1.4.0/go.mod h1:cccZRl6mQpaq41TPp5QxidR+Sa3axMbJDNb//FQX6Gg= +github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= +github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI= +github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= +github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 h1:I0XW9+e1XWDxdcEniV4rQAIOPUGDq67JSCiRCgGCZLI= +github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= +github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= +github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= +github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= +github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= +github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= +github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= +github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= +github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= +github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= +github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= +github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= +github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= +github.com/onsi/gomega v1.16.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= +github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= +github.com/openzipkin/zipkin-go v0.3.0 h1:XtuXmOLIXLjiU2XduuWREDT0LOKtSgos/g7i7RYyoZQ= +github.com/openzipkin/zipkin-go v0.3.0/go.mod h1:4c3sLeE8xjNqehmF5RpAFLPLJxXscc0R4l6Zg0P1tTQ= +github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= +github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= +github.com/pierrec/lz4 v2.6.1+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= +github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= +github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= +github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= +github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= +github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.0/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= +github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M= +github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= +github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= +github.com/prometheus/common v0.28.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= +github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= +github.com/prometheus/common v0.37.0 h1:ccBbHCgIiT9uSoFY0vX8H3zsNR5eLt17/RQLUvn8pXE= +github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= +github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= +github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= +github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= +github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo= +github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4= +github.com/prometheus/statsd_exporter v0.21.0 h1:hA05Q5RFeIjgwKIYEdFd59xu5Wwaznf33yKI+pyX6T8= +github.com/prometheus/statsd_exporter v0.21.0/go.mod h1:rbT83sZq2V+p73lHhPZfMc3MLCHmSHelCh9hSGYNLTQ= +github.com/rabbitmq/amqp091-go v1.1.0/go.mod h1:ogQDLSOACsLPsIq0NpbtiifNZi2YOz0VTJ0kHRghqbM= +github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= +github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= +github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= +github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= +github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= +github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= +github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= +github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= +github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= +github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= +github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= +github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= +github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI= +github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= +github.com/xdg-go/scram v1.0.2/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+hCSs= +github.com/xdg-go/stringprep v1.0.2/go.mod h1:8F9zXuvzgwmyT5DUm4GUfZGDdT3W+LCvS6+da4O5kxM= +github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= +go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= +go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= +go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= +go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= +go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= +go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= +go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= +go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= +go.uber.org/automaxprocs v1.4.0 h1:CpDZl6aOlLhReez+8S3eEotD7Jx0Os++lemPlMULQP0= +go.uber.org/automaxprocs v1.4.0/go.mod h1:/mTEdr7LvHhs0v7mjdxDreTz1OG5zdZGqgOnhWiR/+Q= +go.uber.org/goleak v1.1.11-0.20210813005559-691160354723/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= +go.uber.org/goleak v1.1.12 h1:gZAh5/EyT/HQwlpkCy6wTpqfH9H8Lz8zbm3dZh+OyzA= +go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= +go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4= +go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= +go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= +go.uber.org/zap v1.19.1 h1:ue41HOKd1vGURxrmeKIgELGb3jPW9DMUDGtsinblHwI= +go.uber.org/zap v1.19.1/go.mod h1:j3DNczoxDZroyBnOT1L/Q79cfUMGZxlv/9dzN7SM1rI= +golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20201112155050-0c6587e931a9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20210920023735-84f357641f63/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= +golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= +golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= +golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= +golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= +golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= +golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= +golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= +golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= +golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= +golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= +golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.5.1 h1:OJxoQ/rynoF0dcCdI7cLPktw/hR2cueqYfjm43oqK38= +golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= +golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= +golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= +golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= +golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210917221730-978cfadd31cf/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220225172249-27dd8689420f h1:oA4XRj0qtSt8Yo1Zms0CUlsT3KG69V2UGQWPBxujDmc= +golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b h1:clP8eMhB30EHdc0bd2Twtq6kgU7yl5ub2cQLSdrv1Dg= +golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 h1:uVc8UZUe6tr40fFVnUP5Oj+veunVezqYl9z7DYw9xzw= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a h1:dGzPydgVsqGcTRVwiLJ1jVbufYwmzD3LfVPLKsKg+0k= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20220224211638-0e9765cccd65 h1:M73Iuj3xbbb9Uk1DYhzydthsj6oOd6l9bpuFcNoUvTs= +golang.org/x/time v0.0.0-20220224211638-0e9765cccd65/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= +golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= +golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= +golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= +golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= +golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.9 h1:j9KsMiaP1c3B0OTQGth0/k+miLGTgLsAFUCrF2vLcF8= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +gomodules.xyz/jsonpatch/v2 v2.2.0 h1:4pT439QV83L+G9FkcCriY6EkpcK6r6bK+A5FBUMI7qY= +gomodules.xyz/jsonpatch/v2 v2.2.0/go.mod h1:WXp+iVDkoLQqPudfQ9GBlwB2eZ5DKOnjQZCYdOS8GPY= +google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= +google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= +google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= +google.golang.org/api v0.25.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= +google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= +google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= +google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= +google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= +google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE= +google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= +google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= +google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= +google.golang.org/api v0.47.0/go.mod h1:Wbvgpq1HddcWVtzsVLyfLp8lDg6AA241LmgIL59tHXo= +google.golang.org/api v0.48.0/go.mod h1:71Pr1vy+TAZRPkPs/xlCf5SsU8WjuAWv1Pfjbtukyy4= +google.golang.org/api v0.50.0/go.mod h1:4bNT5pAuq5ji4SRZm+5QIkjny9JAyVD/3gaSihNefaw= +google.golang.org/api v0.51.0/go.mod h1:t4HdrdoNgyN5cbEfm7Lum0lcLDLiise1F8qDKX00sOU= +google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6z3k= +google.golang.org/api v0.55.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= +google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= +google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI= +google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I= +google.golang.org/api v0.63.0/go.mod h1:gs4ij2ffTRXwuzzgJl/56BdwJaA194ijkfn++9tDuPo= +google.golang.org/api v0.67.0/go.mod h1:ShHKP8E60yPsKNw/w8w+VYaj9H6buA5UqDp8dhbQZ6g= +google.golang.org/api v0.70.0 h1:67zQnAE0T2rB0A3CwLSas0K+SbVzSxP+zTLkQLexeiw= +google.golang.org/api v0.70.0/go.mod h1:Bs4ZM2HGifEvXwd50TtW70ovgJffJYw2oRCOFU/SkfA= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= +google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= +google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= +google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA= +google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= +google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= +google.golang.org/genproto v0.0.0-20200527145253-8367513e4ece/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= +google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= +google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= +google.golang.org/genproto v0.0.0-20210513213006-bf773b8c8384/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= +google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= +google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= +google.golang.org/genproto v0.0.0-20210608205507-b6d2f5bf0d7d/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= +google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24= +google.golang.org/genproto v0.0.0-20210713002101-d411969a0d9a/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k= +google.golang.org/genproto v0.0.0-20210716133855-ce7ef5c701ea/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k= +google.golang.org/genproto v0.0.0-20210728212813-7823e685a01f/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= +google.golang.org/genproto v0.0.0-20210805201207-89edb61ffb67/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= +google.golang.org/genproto v0.0.0-20210813162853-db860fec028c/go.mod h1:cFeNkxwySK631ADgubI+/XFU/xp8FD5KIVV4rj8UC5w= +google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210909211513-a8c4777a87af/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211221195035-429b39de9b1c/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20220126215142-9970aeb2e350/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20220207164111-0872dc986b00/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20220218161850-94dd64e39d7c/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= +google.golang.org/genproto v0.0.0-20220301145929-1ac2ace0dbf7 h1:6fWaU2vz6/23eNdMU1V00ZPO5AZFQ2SLsO6r/z0Z2H0= +google.golang.org/genproto v0.0.0-20220301145929-1ac2ace0dbf7/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= +google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= +google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= +google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= +google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= +google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= +google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= +google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= +google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= +google.golang.org/grpc v1.37.1/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= +google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= +google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= +google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= +google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= +google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= +google.golang.org/grpc v1.41.0/go.mod h1:U3l9uK9J0sini8mHphKoXyaqDA/8VyGnDee1zzIUK6k= +google.golang.org/grpc v1.44.0 h1:weqSxi/TMs1SqFRMHCtBgXRs8k3X39QIDEZ0pRcttUg= +google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= +google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= +google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= +google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= +google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= +google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= +google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= +google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= +google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= +google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= +gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= +gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= +gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= +gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= +gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= +gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= +honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= +honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= +k8s.io/api v0.23.9 h1:v7Ee2CZuyb6rVm1q4bUe7ZonWleLsrvgcOTxPGjQVa4= +k8s.io/api v0.23.9/go.mod h1:r4g0GrGdLgwSYB90qgO4tBrbKtALBhUfut+oFt4ikCc= +k8s.io/apimachinery v0.23.9 h1:u9Pu7Ffe+9+QJUemtNjuCwvHSnOUeYEwgSHV+88Ne0g= +k8s.io/apimachinery v0.23.9/go.mod h1:BEuFMMBaIbcOqVIJqNZJXGFTP4W6AycEpb5+m/97hrM= +k8s.io/client-go v0.23.9 h1:OKxNCL+nhw7UBB5b01OVuAV4Db/AdBdaV6/GYpucuOw= +k8s.io/client-go v0.23.9/go.mod h1:sNo0X0MZqo4Uu0qDY5Fl5Y60cJFinBDWWUBOAM5JUCM= +k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= +k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= +k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= +k8s.io/klog/v2 v2.30.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= +k8s.io/klog/v2 v2.70.2-0.20220707122935-0990e81f1a8f h1:dltw7bAn8bCrQ2CmzzhgoieUZEbWqrvIGVdHGioP5nY= +k8s.io/klog/v2 v2.70.2-0.20220707122935-0990e81f1a8f/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= +k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65/go.mod h1:sX9MT8g7NVZM5lVL/j8QyCCJe8YSMW30QvGZWaCIDIk= +k8s.io/kube-openapi v0.0.0-20220124234850-424119656bbf h1:M9XBsiMslw2lb2ZzglC0TOkBPK5NQi0/noUrdnoFwUg= +k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= +k8s.io/utils v0.0.0-20211116205334-6203023598ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= +k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 h1:HNSDgDCrr/6Ly3WEGKZftiE7IY19Vz2GdbOCyI4qqhc= +k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= +knative.dev/control-protocol v0.0.0-20220818153549-f18dbde7d9bd h1:sco6+LdPEq1iYm5Fo1Sva2LuiRjS1tqMqZFAVb7Yfd8= +knative.dev/control-protocol v0.0.0-20220818153549-f18dbde7d9bd/go.mod h1:vO3Xc0k0h6fFVsVG9kNMUMcVKG7MAx7jMbZDvgSuzwI= +knative.dev/networking v0.0.0-20220818010248-e51df7cdf571 h1:Lu/TsJjxg1p+2CMr2LNHEdEFBNHYjDoZv2f1QZoM8jg= +knative.dev/networking v0.0.0-20220818010248-e51df7cdf571/go.mod h1:m3ataWRwmbHjOY9sCFvcDWRNLVITxVl0fH0RxdCa4jE= +knative.dev/pkg v0.0.0-20220818004048-4a03844c0b15 h1:GNmzHVaUo3zoi/wtIN71LPQaWy6DdoYzmb+GIq2s4fw= +knative.dev/pkg v0.0.0-20220818004048-4a03844c0b15/go.mod h1:YLjXbkQLlGHok+u0FLfMbBHFzY9WGu3GHhnrptoAy8I= +knative.dev/serving v0.34.2 h1:bFamUUcc+Rh73mss2ICwmoK+dBKK/MdbgEsfdIK/Mis= +knative.dev/serving v0.34.2/go.mod h1:IyfedOBq3KzcD5dZONjbix2BfS0jOwDq5td8UE9CjCk= +rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= +rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= +rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= +sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6/go.mod h1:p4QtZmO4uMYipTQNzagwnNoseA6OxSUutVw05NhYDRs= +sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 h1:kDi4JBNAsJWfz1aEXhO8Jg87JJaPNLh5tIzYHgStQ9Y= +sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2/go.mod h1:B+TnT182UBxE84DiCz4CVE26eOSDAeYCpfDnC2kdKMY= +sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= +sigs.k8s.io/structured-merge-diff/v4 v4.2.1 h1:bKCqE9GvQ5tiVHn5rfn1r+yao3aLQEaLzkkmAkf+A6Y= +sigs.k8s.io/structured-merge-diff/v4 v4.2.1/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= +sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= +sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo= +sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8= diff --git a/qpext/logger.go b/qpext/logger.go new file mode 100644 index 00000000000..90e8993ab4b --- /dev/null +++ b/qpext/logger.go @@ -0,0 +1,28 @@ +/* +Copyright 2022 The KServe Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +/ + +package logger + +import ( + "go.uber.org/zap" +) + +type Logger = zap.Logger + +func InitializeLogger() Logger { + zaplogger, _ := zap.NewProduction() + return zaplogger +} diff --git a/qpext/qpext.Dockerfile b/qpext/qpext.Dockerfile new file mode 100644 index 00000000000..34beea04639 --- /dev/null +++ b/qpext/qpext.Dockerfile @@ -0,0 +1,20 @@ +# Build the inference qpext binary +FROM golang:1.18 as builder + +# Copy in the go src +WORKDIR /go/src/github.com/kserve/kserve/qpext +COPY go.mod go.mod +COPY go.sum go.sum + +RUN go mod download + +COPY cmd/qpext cmd/qpext +COPY logger.go logger.go + +# Build +RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o qpext ./cmd/qpext + +FROM gcr.io/distroless/static:nonroot +WORKDIR /ko-app +COPY --from=builder /go/src/github.com/kserve/kserve/qpext /ko-app/ +ENTRYPOINT ["/ko-app/qpext"] diff --git a/test/e2e/qpext/__init__.py b/test/e2e/qpext/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/test/e2e/qpext/test_qpext.py b/test/e2e/qpext/test_qpext.py new file mode 100644 index 00000000000..fbb4b64afcd --- /dev/null +++ b/test/e2e/qpext/test_qpext.py @@ -0,0 +1,94 @@ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import os +import logging +import time +import requests +import portforward +from kubernetes import client +from kserve import ( + constants, + KServeClient, + V1beta1InferenceService, + V1beta1InferenceServiceSpec, + V1beta1PredictorSpec, + V1beta1SKLearnSpec, +) +from kubernetes.client import V1ResourceRequirements +from ..common.utils import KSERVE_TEST_NAMESPACE +from ..common.utils import predict + +logging.basicConfig(level=logging.INFO) + +ENABLE_METRIC_AGG = "serving.kserve.io/enable-metric-aggregation" +METRICS_AGG_PORT = 9088 +METRICS_PATH = "/metrics" + + +def test_qpext_kserve(): + # test the qpext using the sklearn predictor + service_name = "isvc-sklearn-v2" + predictor = V1beta1PredictorSpec( + min_replicas=1, + sklearn=V1beta1SKLearnSpec( + storage_uri="gs://seldon-models/sklearn/mms/lr_model", + protocol_version="v2", + resources=V1ResourceRequirements( + requests={"cpu": "50m", "memory": "128Mi"}, + limits={"cpu": "100m", "memory": "512Mi"}, + ), + ), + ) + + isvc = V1beta1InferenceService( + api_version=constants.KSERVE_V1BETA1, + kind=constants.KSERVE_KIND, + metadata=client.V1ObjectMeta( + name=service_name, namespace=KSERVE_TEST_NAMESPACE, + # set the metric aggregation annotation to true + annotations={ENABLE_METRIC_AGG: "true"}, + ), + spec=V1beta1InferenceServiceSpec(predictor=predictor), + ) + + kserve_client = KServeClient(config_file=os.environ.get("KUBECONFIG", "~/.kube/config")) + kserve_client.create(isvc) + kserve_client.wait_isvc_ready(service_name, namespace=KSERVE_TEST_NAMESPACE) + + res = predict(service_name, "./data/iris_input_v2.json", protocol_version="v2") + assert res["outputs"][0]["data"] == [1, 1] + + send_metrics_request(kserve_client, service_name) + kserve_client.delete(service_name, KSERVE_TEST_NAMESPACE) + + +def send_metrics_request(kserve_client, service_name): + time.sleep(10) + pods = kserve_client.core_api.list_namespaced_pod(KSERVE_TEST_NAMESPACE, + label_selector='serving.kserve.io/inferenceservice={}'. + format(service_name)) + pod_name = "" + for pod in pods.items: + # get a pod name + pod_name = pod.metadata.name + break + + url = f"http://localhost:{METRICS_AGG_PORT}/{METRICS_PATH}" + with portforward.forward(KSERVE_TEST_NAMESPACE, pod_name, METRICS_AGG_PORT, METRICS_AGG_PORT): + response = requests.get(url) + logging.info(f"response: {response}, content: {response.content}") + logging.info("Got response code %s, content %s", response.status_code, response.content) + + assert response.status_code == 200 + assert len(response.content) > 0 diff --git a/test/scripts/gh-actions/build-qpext-image.sh b/test/scripts/gh-actions/build-qpext-image.sh new file mode 100755 index 00000000000..0cfd8d30a31 --- /dev/null +++ b/test/scripts/gh-actions/build-qpext-image.sh @@ -0,0 +1,29 @@ +#!/bin/bash + +# Copyright 2022 The KServe Authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# The script is used to build all the queue-proxy extension image. + +set -o errexit +set -o nounset +set -o pipefail +echo "Github SHA ${GITHUB_SHA}" +export QPEXT_IMG=kserve/qpext:${GITHUB_SHA} + +pushd qpext >/dev/null +echo "Building queue proxy extension image" +docker build -t ${QPEXT_IMG} -f qpext.Dockerfile . +popd +echo "Done building image" diff --git a/test/scripts/gh-actions/run-e2e-tests.sh b/test/scripts/gh-actions/run-e2e-tests.sh index 8a74af7587b..c557a7773ba 100755 --- a/test/scripts/gh-actions/run-e2e-tests.sh +++ b/test/scripts/gh-actions/run-e2e-tests.sh @@ -22,5 +22,5 @@ set -o pipefail echo "Starting E2E functional tests ..." pushd test/e2e >/dev/null - pytest -m "$1" + pytest -m "$1" --ignore=qpext popd diff --git a/test/scripts/gh-actions/run-qpext-test.sh b/test/scripts/gh-actions/run-qpext-test.sh new file mode 100755 index 00000000000..4506c414883 --- /dev/null +++ b/test/scripts/gh-actions/run-qpext-test.sh @@ -0,0 +1,26 @@ +#!/bin/bash + +# Copyright 2022 The KServe Authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# The script is used to deploy knative and kserve, and run e2e tests. + +set -o errexit +set -o nounset +set -o pipefail + +echo "Starting E2E queue proxy extension tests ..." +pushd test/e2e >/dev/null + pytest qpext +popd
horovod__horovod-2262	[Horovod on Ray]Failed on example of tensorflow2_mnist_ray.py Environment: 1. Framework: (TensorFlow1.15.0) 3. Horovod version:0.20.0 Your question: Please ask your question here. Hi @tgaddair @richardliaw I tried the example of Horovod on ray on CPU nodes, but failed. The ray cluster is ok. Using TensorFlow backend. [2m[36m(pid=262081)[0m Using TensorFlow backend. [2m[36m(pid=262071)[0m Using TensorFlow backend. Traceback (most recent call last): File "tensorflow2_mnist_ray.py", line 94, in <module> executor.run(train, kwargs=dict(num_epochs=1)) File "/home/xianyang/sw/miniconda3/envs/test/lib/python3.7/site-packages/horovod/ray/runner.py", line 426, in run lambda w: fn(args, *kwargs)) for worker in self.workers]) File "/home/xianyang/sw/miniconda3/envs/test/lib/python3.7/site-packages/ray/worker.py", line 1516, in get raise value.as_instanceof_cause() ray.exceptions.RayTaskError(RecursionError): [36mray::BaseHorovodWorker.execute()[39m (pid=262081, ip=10.0.0.131) File "python/ray/_raylet.pyx", line 414, in ray._raylet.execute_task File "python/ray/_raylet.pyx", line 431, in ray._raylet.execute_task File "/home/xianyang/sw/miniconda3/envs/test/lib/python3.7/site-packages/ray/serialization.py", line 317, in deserialize_objects self._deserialize_object(data, metadata, object_id)) File "/home/xianyang/sw/miniconda3/envs/test/lib/python3.7/site-packages/ray/serialization.py", line 257, in _deserialize_object return self._deserialize_msgpack_data(data, metadata) File "/home/xianyang/sw/miniconda3/envs/test/lib/python3.7/site-packages/ray/serialization.py", line 238, in _deserialize_msgpack_data python_objects = self._deserialize_pickle5_data(pickle5_data) File "/home/xianyang/sw/miniconda3/envs/test/lib/python3.7/site-packages/ray/serialization.py", line 226, in _deserialize_pickle5_data obj = pickle.loads(in_band) File "/home/xianyang/sw/miniconda3/envs/test/lib/python3.7/site-packages/tensorflow/__init__.py", line 50, in __getattr__ module = self._load() File "/home/xianyang/sw/miniconda3/envs/test/lib/python3.7/site-packages/tensorflow/__init__.py", line 44, in _load module = _importlib.import_module(self.__name__) File "/home/xianyang/sw/miniconda3/envs/test/lib/python3.7/site-packages/tensorflow/__init__.py", line 50, in __getattr__ module = self._load() File "/home/xianyang/sw/miniconda3/envs/test/lib/python3.7/site-packages/tensorflow/__init__.py", line 44, in _load module = _importlib.import_module(self.__name__) File "/home/xianyang/sw/miniconda3/envs/test/lib/python3.7/site-packages/tensorflow/__init__.py", line 50, in __getattr__ module = self._load() File "/home/xianyang/sw/miniconda3/envs/test/lib/python3.7/site-packages/tensorflow/__init__.py", line 44, in _load module = _importlib.import_module(self.__name__) ....... File "/home/xianyang/sw/miniconda3/envs/test/lib/python3.7/site-packages/tensorflow/__init__.py", line 50, in __getattr__ module = self._load() File "/home/xianyang/sw/miniconda3/envs/test/lib/python3.7/site-packages/tensorflow/__init__.py", line 44, in _load module = _importlib.import_module(self.__name__) File "/home/xianyang/sw/miniconda3/envs/test/lib/python3.7/site-packages/tensorflow/__init__.py", line 50, in __getattr__ module = self._load() File "/home/xianyang/sw/miniconda3/envs/test/lib/python3.7/site-packages/tensorflow/__init__.py", line 44, in _load module = _importlib.import_module(self.__name__) File "/home/xianyang/sw/miniconda3/envs/test/lib/python3.7/site-packages/tensorflow/__init__.py", line 50, in __getattr__ module = self._load() File "/home/xianyang/sw/miniconda3/envs/test/lib/python3.7/site-packages/tensorflow/__init__.py", line 44, in _load module = _importlib.import_module(self.__name__) File "/home/xianyang/sw/miniconda3/envs/test/lib/python3.7/site-packages/tensorflow/__init__.py", line 50, in __getattr__ module = self._load() File "/home/xianyang/sw/miniconda3/envs/test/lib/python3.7/site-packages/tensorflow/__init__.py", line 44, in _load module = _importlib.import_module(self.__name__) File "/home/xianyang/sw/miniconda3/envs/test/lib/python3.7/site-packages/tensorflow/__init__.py", line 50, in __getattr__ module = self._load() File "/home/xianyang/sw/miniconda3/envs/test/lib/python3.7/site-packages/tensorflow/__init__.py", line 44, in _load module = _importlib.import_module(self.__name__) RecursionError: maximum recursion depth exceeded while calling a Python object	[ { "content": "import tensorflow as tf\nimport horovod.tensorflow.keras as hvd\nimport horovod.keras as hvd\n\nimport ray\nfrom horovod.ray import RayExecutor\n\n\ndef train(num_epochs):\n # Horovod: initialize Horovod.\n hvd.init()\n\n # Horovod: pin GPU to be used to process local rank (one GPU per pr...	[ { "content": "import tensorflow as tf\nimport horovod.tensorflow.keras as hvd\n\nimport ray\nfrom horovod.ray import RayExecutor\n\n\ndef train(num_epochs):\n # Horovod: initialize Horovod.\n hvd.init()\n\n # Horovod: pin GPU to be used to process local rank (one GPU per process)\n gpus = tf.config....	diff --git a/examples/tensorflow2_mnist_ray.py b/examples/tensorflow2_mnist_ray.py index f44905221b..1e446d931c 100644 --- a/examples/tensorflow2_mnist_ray.py +++ b/examples/tensorflow2_mnist_ray.py @@ -1,6 +1,5 @@ import tensorflow as tf import horovod.tensorflow.keras as hvd -import horovod.keras as hvd import ray from horovod.ray import RayExecutor
PaddlePaddle__PaddleSpeech-1311	speech_recognition示例运行出错这是源码： import paddle from paddlespeech.cli import ASRExecutor asr_executor = ASRExecutor() text = asr_executor( model='conformer_wenetspeech', lang='zh', sample_rate=16000, config=None, # Set `config` and `ckpt_path` to None to use pretrained model. ckpt_path=None, audio_file='input.wav', force_yes=False, device=paddle.get_device()) print('ASR Result: \n{}'.format(text)) 运行后提示： Traceback (most recent call last): File "D:\BaiduNetdiskDownload\PaddleSpeech-r0.1.0\demos\speech_recognition\speech_recognition.py", line 5, in <module> text = asr_executor( File "D:\BaiduNetdiskDownload\PaddleSpeech-r0.1.0\paddlespeech\cli\asr\infer.py", line 449, in __call__ self._init_from_path(model, lang, sample_rate, config, ckpt_path) File "D:\BaiduNetdiskDownload\PaddleSpeech-r0.1.0\paddlespeech\cli\asr\infer.py", line 166, in _init_from_path self.config.merge_from_file(self.cfg_path) File "D:\SoftWare\Anaconda\lib\site-packages\yacs\config.py", line 212, in merge_from_file cfg = self.load_cfg(f) File "D:\SoftWare\Anaconda\lib\site-packages\yacs\config.py", line 349, in load_cfg return cls._load_cfg_from_file(cfg_file_obj_or_str) File "D:\SoftWare\Anaconda\lib\site-packages\yacs\config.py", line 358, in _load_cfg_from_file return cls._load_cfg_from_yaml_str(file_obj.read()) File "D:\SoftWare\Anaconda\lib\site-packages\yacs\config.py", line 371, in _load_cfg_from_yaml_str return cls(cfg_as_dict) File "D:\SoftWare\Anaconda\lib\site-packages\yacs\config.py", line 86, in __init__ init_dict = self._create_config_tree_from_dict(init_dict, key_list) File "D:\SoftWare\Anaconda\lib\site-packages\yacs\config.py", line 126, in _create_config_tree_from_dict dic[k] = cls(v, key_list=key_list + [k]) File "D:\SoftWare\Anaconda\lib\site-packages\yacs\config.py", line 86, in __init__ init_dict = self._create_config_tree_from_dict(init_dict, key_list) File "D:\SoftWare\Anaconda\lib\site-packages\yacs\config.py", line 126, in _create_config_tree_from_dict dic[k] = cls(v, key_list=key_list + [k]) File "D:\SoftWare\Anaconda\lib\site-packages\yacs\config.py", line 86, in __init__ init_dict = self._create_config_tree_from_dict(init_dict, key_list) File "D:\SoftWare\Anaconda\lib\site-packages\yacs\config.py", line 129, in _create_config_tree_from_dict _assert_with_logging( File "D:\SoftWare\Anaconda\lib\site-packages\yacs\config.py", line 521, in _assert_with_logging assert cond, msg AssertionError: Key model.model_conf.ctc_grad_norm_type with value <class 'NoneType'> is not a valid type; valid types: {<class 'list'>, <class 'tuple'>, <class 'str'>, <class 'int'>, <class 'float'>, <class 'bool'>} 目前是按照文档在windows下进行的paddlepaddle安装，并下载了PaddleSpeech-r0.1.0源码后直接进行的测试，请问我该如何解决这个问题，谢谢	[ { "content": "# Copyright (c) 2020 PaddlePaddle Authors. All Rights Reserved.\n#\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2....	[ { "content": "# Copyright (c) 2020 PaddlePaddle Authors. All Rights Reserved.\n#\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2....	diff --git a/requirements.txt b/requirements.txt index e567dfa7099..c6889318398 100644 --- a/requirements.txt +++ b/requirements.txt @@ -43,5 +43,5 @@ typeguard unidecode visualdl webrtcvad -yacs +yacs~=0.1.8 yq diff --git a/setup.py b/setup.py index 75b3fe5c809..5d4ff80f7bc 100644 --- a/setup.py +++ b/setup.py @@ -61,7 +61,7 @@ "typeguard", "visualdl", "webrtcvad", - "yacs", + "yacs~=0.1.8", ], "develop": [ "ConfigArgParse",
pyodide__pyodide-4018	Add check for WASM magic number in .so files > `pyodide build` now replaces native `.so` slugs with Emscripten > slugs. Usually `.so`s in the generated wheels are actually Emscripten `.so`s > so this is good. If they are actually native `.so`s then there is a problem > either way. Not very critical, but should we actually check that the .so are emscripten .so rather than native .so that ended up there by mistake? For instance, we could check for the [WASM magic number](https://openhome.cc/eGossip/WebAssembly/Module.html) in the first 4 bytes maybe? It's supposed to be, `0061 736d`. Though I get the same bytes but in a different order, when I try, ``` $ hexdump -n 8 numpy/core/_multiarray_umath.cpython-311-wasm32-emscripten.so 0000000 6100 6d73 0001 0000 ``` but maybe I'm using hexdump wrong (Edit: yes, with the `-C` option it's better) _Originally posted by @rth in https://github.com/pyodide/pyodide/issues/3927#issuecomment-1599511454_	[ { "content": "# Common functions shared by other modules.\n# Notes for contributors:\n# This module should not import any other modules from pyodide-build except logger to avoid circular imports.\n\nimport contextlib\nimport hashlib\nimport os\nimport shutil\nimport subprocess\nimport sys\nimport textwrap\nim...	[ { "content": "# Common functions shared by other modules.\n# Notes for contributors:\n# This module should not import any other modules from pyodide-build except logger to avoid circular imports.\n\nimport contextlib\nimport hashlib\nimport os\nimport shutil\nimport subprocess\nimport sys\nimport textwrap\nim...	diff --git a/docs/project/changelog.md b/docs/project/changelog.md index e7f1b7e0c71..8fa3bc9267a 100644 --- a/docs/project/changelog.md +++ b/docs/project/changelog.md @@ -15,6 +15,10 @@ myst: ## Unreleased +- {{ Enhancement }} Adds `check_wasm_magic_number` function to validate `.so` + files for WebAssembly (WASM) compatibility. + {pr}`4018` + - {{ Enhancement }} Add an example for `loadPyodide` and `pyodide.runPython {pr}`4012`, {pr}`4011` diff --git a/pyodide-build/pyodide_build/common.py b/pyodide-build/pyodide_build/common.py index 534b559204f..f638a49159d 100644 --- a/pyodide-build/pyodide_build/common.py +++ b/pyodide-build/pyodide_build/common.py @@ -371,3 +371,9 @@ def get_wheel_dist_info_dir(wheel: ZipFile, pkg_name: str) -> str: ) return info_dir + + +def check_wasm_magic_number(file_path: Path) -> bool: + WASM_BINARY_MAGIC = b"\0asm" + with file_path.open(mode="rb") as file: + return file.read(4) == WASM_BINARY_MAGIC diff --git a/pyodide-build/pyodide_build/tests/test_common.py b/pyodide-build/pyodide_build/tests/test_common.py index 2dd8fffddbc..5a512d2baf2 100644 --- a/pyodide-build/pyodide_build/tests/test_common.py +++ b/pyodide-build/pyodide_build/tests/test_common.py @@ -3,6 +3,7 @@ import pytest from pyodide_build.common import ( + check_wasm_magic_number, environment_substitute_args, extract_wheel_metadata_file, find_missing_executables, @@ -152,3 +153,14 @@ def test_extract_wheel_metadata_file(tmp_path): with pytest.raises(Exception): extract_wheel_metadata_file(input_path_empty, output_path_empty) + + +def test_check_wasm_magic_number(tmp_path): + wasm_magic_number = b"\x00asm\x01\x00\x00\x00\x00\x11" + not_wasm_magic_number = b"\x7fELF\x02\x01\x01\x00\x00\x00" + + (tmp_path / "goodfile.so").write_bytes(wasm_magic_number) + assert check_wasm_magic_number(tmp_path / "goodfile.so") is True + + (tmp_path / "badfile.so").write_bytes(not_wasm_magic_number) + assert check_wasm_magic_number(tmp_path / "badfile.so") is False
ivy-llc__ivy-13218	iscomplex Marked as closed in #10862, yet it's unimplemented.	[ { "content": "# local\nimport ivy\nfrom ivy.functional.frontends.jax.func_wrapper import (\n to_ivy_arrays_and_back,\n)\nfrom ivy.functional.frontends.jax.numpy import (\n promote_types_of_jax_inputs as promote_jax_arrays,\n)\n\n\n@to_ivy_arrays_and_back\ndef allclose(a, b, rtol=1e-05, atol=1e-08, equal_n...	[ { "content": "# local\nimport ivy\nfrom ivy.functional.frontends.jax.func_wrapper import (\n to_ivy_arrays_and_back,\n)\nfrom ivy.functional.frontends.jax.numpy import (\n promote_types_of_jax_inputs as promote_jax_arrays,\n)\n\n\n@to_ivy_arrays_and_back\ndef allclose(a, b, rtol=1e-05, atol=1e-08, equal_n...	diff --git a/ivy/functional/frontends/jax/numpy/logic.py b/ivy/functional/frontends/jax/numpy/logic.py index e2c82f2458170..ff1b7db94a9f7 100644 --- a/ivy/functional/frontends/jax/numpy/logic.py +++ b/ivy/functional/frontends/jax/numpy/logic.py @@ -205,3 +205,7 @@ def right_shift(x1, x2, /): def isrealobj(x: any): return not ivy.is_complex_dtype(ivy.dtype(x)) + +@to_ivy_arrays_and_back +def iscomplex(x: any): + return ivy.bitwise_invert(ivy.isreal(x)) diff --git a/ivy_tests/test_ivy/test_frontends/test_jax/test_jax_numpy_logic.py b/ivy_tests/test_ivy/test_frontends/test_jax/test_jax_numpy_logic.py index d2cf5b2710fc9..e7d73071a572d 100644 --- a/ivy_tests/test_ivy/test_frontends/test_jax/test_jax_numpy_logic.py +++ b/ivy_tests/test_ivy/test_frontends/test_jax/test_jax_numpy_logic.py @@ -887,6 +887,33 @@ def test_jax_numpy_right_shift( ) +# iscomplex +@handle_frontend_test( + fn_tree="jax.numpy.iscomplex", + dtype_and_x=helpers.dtype_and_values( + available_dtypes=helpers.get_dtypes("real_and_complex"), min_num_dims=1 + ), + test_with_out=st.just(False), +) +def test_jax_numpy_iscomplex( + dtype_and_x, + frontend, + on_device, + *, + fn_tree, + test_flags, +): + input_dtype, x = dtype_and_x + helpers.test_frontend_function( + input_dtypes=input_dtype, + frontend=frontend, + test_flags=test_flags, + fn_tree=fn_tree, + on_device=on_device, + x=x[0], + ) + + @handle_frontend_test( fn_tree="jax.numpy.isrealobj", dtype_and_x=helpers.dtype_and_values(
cupy__cupy-2615	cupy.where fails for complex arrays The function cupy.where does not work for complex arrays (numpy.where does): ``` import cupy as cp a = cp.arange(5).astype(cp.complex128) b = cp.arange(5).astype(cp.complex128) c = cp.where(a==b,a,b) ``` fails with the error message > TypeError: Wrong type ((<class 'numpy.bool_'>, <class 'numpy.complex128'>, <class 'numpy.complex128'>)) of arguments for cupy_where For `cp.float64`, everything works fine. CuPy Version : 6.4.0 CUDA Root : /usr CUDA Build Version : 8000 CUDA Driver Version : 10020 CUDA Runtime Version : 8000 cuDNN Build Version : 7102 cuDNN Version : 7102 NCCL Build Version : 2213 NCCL Runtime Version : (unknown)	[ { "content": "from cupy import core\nfrom cupy.core import fusion\n\n\ndef argmax(a, axis=None, dtype=None, out=None, keepdims=False):\n \"\"\"Returns the indices of the maximum along an axis.\n\n Args:\n a (cupy.ndarray): Array to take argmax.\n axis (int): Along which axis to find the maxi...	[ { "content": "from cupy import core\nfrom cupy.core import fusion\n\n\ndef argmax(a, axis=None, dtype=None, out=None, keepdims=False):\n \"\"\"Returns the indices of the maximum along an axis.\n\n Args:\n a (cupy.ndarray): Array to take argmax.\n axis (int): Along which axis to find the maxi...	diff --git a/cupy/sorting/search.py b/cupy/sorting/search.py index 4abc58a5377..cc8d395f1b0 100644 --- a/cupy/sorting/search.py +++ b/cupy/sorting/search.py @@ -100,7 +100,7 @@ def flatnonzero(a): # works). # See issue #551. '?hd->d', '?Hd->d', - '?dd->d'), + '?dd->d', '?FF->F', '?DD->D'), 'out0 = in0 ? in1 : in2') diff --git a/tests/cupy_tests/sorting_tests/test_search.py b/tests/cupy_tests/sorting_tests/test_search.py index 9bdd0744013..b27971ed771 100644 --- a/tests/cupy_tests/sorting_tests/test_search.py +++ b/tests/cupy_tests/sorting_tests/test_search.py @@ -163,7 +163,7 @@ def test_argmin_zero_size_axis1(self, xp, dtype): class TestWhereTwoArrays(unittest.TestCase): @testing.for_all_dtypes_combination( - names=['cond_type', 'x_type', 'y_type'], no_complex=True) + names=['cond_type', 'x_type', 'y_type']) @testing.numpy_cupy_allclose() def test_where_two_arrays(self, xp, cond_type, x_type, y_type): m = testing.shaped_random(self.cond_shape, xp, xp.bool_) @@ -184,7 +184,7 @@ def test_where_two_arrays(self, xp, cond_type, x_type, y_type): @testing.gpu class TestWhereCond(unittest.TestCase): - @testing.for_all_dtypes(no_complex=True) + @testing.for_all_dtypes() @testing.numpy_cupy_array_list_equal() def test_where_cond(self, xp, dtype): m = testing.shaped_random(self.cond_shape, xp, xp.bool_)
lutris__lutris-2561	Can't use any installers When I try to install Epic Games Store, for example https://lutris.net/games/epic-games-store/ the installer eventually fails on this: ``` 2019-12-29 10:35:48,329: Error while completing task <bound method CommandsMixin.execute of <lutris.installer.interpreter.ScriptInterpreter object at 0x7f3f726e59a0>>: sequence item 1: expected str instance, list found <class 'TypeError'> sequence item 1: expected str instance, list found File "/usr/lib/python3.8/site-packages/lutris/util/jobs.py", line 30, in target result = self.function(args, *kwargs) File "/usr/lib/python3.8/site-packages/lutris/installer/commands.py", line 152, in execute command.start() File "/usr/lib/python3.8/site-packages/lutris/command.py", line 116, in start logger.debug("Running %s", " ".join(self.wrapper_command)) ``` It seems to affect all installers though, not just this one.	[ { "content": "\"\"\"Threading module, used to launch games while monitoring them.\"\"\"\n\nimport io\nimport os\nimport sys\nimport fcntl\nimport shlex\nimport subprocess\nimport contextlib\nfrom textwrap import dedent\n\nfrom gi.repository import GLib\n\nfrom lutris import settings\nfrom lutris import runtime\...	[ { "content": "\"\"\"Threading module, used to launch games while monitoring them.\"\"\"\n\nimport io\nimport os\nimport sys\nimport fcntl\nimport shlex\nimport subprocess\nimport contextlib\nfrom textwrap import dedent\n\nfrom gi.repository import GLib\n\nfrom lutris import settings\nfrom lutris import runtime\...	diff --git a/lutris/command.py b/lutris/command.py index bba04808c9..24ad8a9bfa 100644 --- a/lutris/command.py +++ b/lutris/command.py @@ -61,7 +61,7 @@ def __init__( self._stdout = io.StringIO() - self._title = title if title else command + self._title = title if title else command[0] @property def stdout(self):
pymedusa__Medusa-6525	Medusa not working with pythonw on Windows Hi, Today I upgraded to the new 0.3.0 and also upgraded to Python 3.7.2 (from 2.7), but now Meduse won't work using `pythonw` anymore. When I launch via pythonw I see the pythonw process appear and almost immedately shutdown again. Since it's pythonw there is no output, and nothing appears in the application log either. I've tried to debug a bit but I'm stuck. As soon I put in `start.py` the line: ``` sys.stderr = open('stderr.txt', 'a') ``` To try and catch any errors, Medusa actually magically starts working, but the log file remains empty (I've verified I am opening the correct file by actually writing something to it, when I do that my write appears in the log file but still nothing else). My guess is something in the code tries to access `sys.stderr`, but since that's not available when running with `pythonw` the code breaks and the process exits. However because I'm not a Python developer I don't have any proper tools like step-debugging to find out exactly where it fails :(.	[ { "content": "# Copyright (c) 2003-2005 Jimmy Retzlaff, 2008 Konstantin Yegupov\n#\n# Permission is hereby granted, free of charge, to any person obtaining\n# a copy of this software and associated documentation files (the\n# \"Software\"), to deal in the Software without restriction, including\n# without limit...	[ { "content": "# Copyright (c) 2003-2005 Jimmy Retzlaff, 2008 Konstantin Yegupov\n#\n# Permission is hereby granted, free of charge, to any person obtaining\n# a copy of this software and associated documentation files (the\n# \"Software\"), to deal in the Software without restriction, including\n# without limit...	diff --git a/lib/unrar2/windows.py b/lib/unrar2/windows.py index 8a06a2ed8d..b4de3b2ce7 100644 --- a/lib/unrar2/windows.py +++ b/lib/unrar2/windows.py @@ -34,7 +34,7 @@ from .rar_exceptions import * -if sys.version_info > (3,3): +if sys.version_info > (3,3) and sys.stderr is not None: import faulthandler faulthandler.enable()
pandas-dev__pandas-12013	Msgpack - ValueError: buffer source array is read-only I get the Value error when processing data using pandas. I followed the following steps: 1. convert to msgpack format with compress flag 2. subsequently read file into a dataframe 3. push to sql table with to_sql On the third step i get ValueError: buffer source array is read-only. This problem does not arise if I wrap the read_msgpack call inside a pandas.concat Example ``` python import pandas as pd import numpy as np from sqlalchemy import create_engine eng = create_engine("sqlite:///:memory:") df1 = pd.DataFrame({ 'A' : 1., 'B' : pd.Timestamp('20130102'), 'C' : pd.Series(1,index=list(range(4)),dtype='float32'), 'D' : np.array([3] * 4,dtype='int32'), 'E' : 'foo' }) df1.to_msgpack('test.msgpack', compress='zlib') df2 = pd.read_msgpack('test.msgpack') df2.to_sql('test', eng, if_exists='append', chunksize=1000) # throws value error df2 = pd.cooncat([pd.read_msgpack('test.msgpack')]) df2.to_sql('test', eng, if_exists='append', chunksize=1000) # works ``` This happens with both blosc and zlib compression. While I have found a solution, this behaviour seems very odd and for very large files there is a small performance hit. edit: @TomAugspurger changed the sql engine to sqlite	[ { "content": "\"\"\"\n\nprovide a generic structure to support window functions,\nsimilar to how we have a Groupby object\n\n\n\"\"\"\nfrom __future__ import division\n\nimport warnings\nimport numpy as np\nfrom functools import wraps\nfrom collections import defaultdict\n\nimport pandas as pd\nfrom pandas.lib ...	[ { "content": "\"\"\"\n\nprovide a generic structure to support window functions,\nsimilar to how we have a Groupby object\n\n\n\"\"\"\nfrom __future__ import division\n\nimport warnings\nimport numpy as np\nfrom functools import wraps\nfrom collections import defaultdict\n\nimport pandas as pd\nfrom pandas.lib ...	diff --git a/doc/source/whatsnew/v0.18.0.txt b/doc/source/whatsnew/v0.18.0.txt index 4ce2ce5b69cb4..3496e9eea834c 100644 --- a/doc/source/whatsnew/v0.18.0.txt +++ b/doc/source/whatsnew/v0.18.0.txt @@ -463,6 +463,7 @@ Bug Fixes - Bug in ``pd.read_clipboard`` and ``pd.to_clipboard`` functions not supporting Unicode; upgrade included ``pyperclip`` to v1.5.15 (:issue:`9263`) - Bug in ``DataFrame.query`` containing an assignment (:issue:`8664`) +- Bug in ``from_msgpack`` where ``__contains__()`` fails for columns of the unpacked ``DataFrame``, if the ``DataFrame`` has object columns. (:issue: `11880`) - Bug in timezone info lost when broadcasting scalar datetime to ``DataFrame`` (:issue:`11682`) diff --git a/pandas/core/window.py b/pandas/core/window.py index 1e5816e898baa..ce8fda9e932bc 100644 --- a/pandas/core/window.py +++ b/pandas/core/window.py @@ -965,6 +965,7 @@ def corr(self, other=None, pairwise=None, **kwargs): Use a standard estimation bias correction """ + class EWM(_Rolling): r""" Provides exponential weighted functions diff --git a/pandas/hashtable.pyx b/pandas/hashtable.pyx index 58e9d64921e0d..a5fcbd3f2d0f1 100644 --- a/pandas/hashtable.pyx +++ b/pandas/hashtable.pyx @@ -342,7 +342,7 @@ cdef class Int64HashTable(HashTable): self.table.vals[k] = <Py_ssize_t> values[i] @cython.boundscheck(False) - def map_locations(self, int64_t[:] values): + def map_locations(self, ndarray[int64_t, ndim=1] values): cdef: Py_ssize_t i, n = len(values) int ret = 0 @@ -570,7 +570,7 @@ cdef class Float64HashTable(HashTable): return np.asarray(labels) @cython.boundscheck(False) - def map_locations(self, float64_t[:] values): + def map_locations(self, ndarray[float64_t, ndim=1] values): cdef: Py_ssize_t i, n = len(values) int ret = 0 diff --git a/pandas/io/tests/test_packers.py b/pandas/io/tests/test_packers.py index d6a9feb1bd8f4..61b24c858b60d 100644 --- a/pandas/io/tests/test_packers.py +++ b/pandas/io/tests/test_packers.py @@ -9,8 +9,8 @@ from pandas import compat from pandas.compat import u from pandas import (Series, DataFrame, Panel, MultiIndex, bdate_range, - date_range, period_range, Index, SparseSeries, SparseDataFrame, - SparsePanel) + date_range, period_range, Index) +from pandas.io.packers import to_msgpack, read_msgpack import pandas.util.testing as tm from pandas.util.testing import (ensure_clean, assert_index_equal, assert_series_equal, @@ -23,7 +23,19 @@ nan = np.nan -from pandas.io.packers import to_msgpack, read_msgpack +try: + import blosc # NOQA +except ImportError: + _BLOSC_INSTALLED = False +else: + _BLOSC_INSTALLED = True + +try: + import zlib # NOQA +except ImportError: + _ZLIB_INSTALLED = False +else: + _ZLIB_INSTALLED = True _multiprocess_can_split_ = False @@ -483,6 +495,14 @@ class TestCompression(TestPackers): """ def setUp(self): + try: + from sqlalchemy import create_engine + self._create_sql_engine = create_engine + except ImportError: + self._SQLALCHEMY_INSTALLED = False + else: + self._SQLALCHEMY_INSTALLED = True + super(TestCompression, self).setUp() data = { 'A': np.arange(1000, dtype=np.float64), @@ -508,14 +528,56 @@ def test_compression_zlib(self): assert_frame_equal(self.frame[k], i_rec[k]) def test_compression_blosc(self): - try: - import blosc - except ImportError: + if not _BLOSC_INSTALLED: raise nose.SkipTest('no blosc') i_rec = self.encode_decode(self.frame, compress='blosc') for k in self.frame.keys(): assert_frame_equal(self.frame[k], i_rec[k]) + def test_readonly_axis_blosc(self): + # GH11880 + if not _BLOSC_INSTALLED: + raise nose.SkipTest('no blosc') + df1 = DataFrame({'A': list('abcd')}) + df2 = DataFrame(df1, index=[1., 2., 3., 4.]) + self.assertTrue(1 in self.encode_decode(df1['A'], compress='blosc')) + self.assertTrue(1. in self.encode_decode(df2['A'], compress='blosc')) + + def test_readonly_axis_zlib(self): + # GH11880 + df1 = DataFrame({'A': list('abcd')}) + df2 = DataFrame(df1, index=[1., 2., 3., 4.]) + self.assertTrue(1 in self.encode_decode(df1['A'], compress='zlib')) + self.assertTrue(1. in self.encode_decode(df2['A'], compress='zlib')) + + def test_readonly_axis_blosc_to_sql(self): + # GH11880 + if not _BLOSC_INSTALLED: + raise nose.SkipTest('no blosc') + if not self._SQLALCHEMY_INSTALLED: + raise nose.SkipTest('no sqlalchemy') + expected = DataFrame({'A': list('abcd')}) + df = self.encode_decode(expected, compress='blosc') + eng = self._create_sql_engine("sqlite:///:memory:") + df.to_sql('test', eng, if_exists='append') + result = pandas.read_sql_table('test', eng, index_col='index') + result.index.names = [None] + assert_frame_equal(expected, result) + + def test_readonly_axis_zlib_to_sql(self): + # GH11880 + if not _ZLIB_INSTALLED: + raise nose.SkipTest('no zlib') + if not self._SQLALCHEMY_INSTALLED: + raise nose.SkipTest('no sqlalchemy') + expected = DataFrame({'A': list('abcd')}) + df = self.encode_decode(expected, compress='zlib') + eng = self._create_sql_engine("sqlite:///:memory:") + df.to_sql('test', eng, if_exists='append') + result = pandas.read_sql_table('test', eng, index_col='index') + result.index.names = [None] + assert_frame_equal(expected, result) + class TestEncoding(TestPackers): def setUp(self):
encode__uvicorn-1099	PackageInfo: Invalid constraint (click (>=7.)) found in uvicorn-0.14.0 dependencies, skipping ### Checklist <!-- Please make sure you check all these items before submitting your bug report. --> - [X] The bug is reproducible against the latest release and/or `master`. - [X] There are no similar issues or pull requests to fix it yet. ### Describe the bug When adding uvicorn package with poetry the following warning is raised: PackageInfo: Invalid constraint (click (>=7.)) found in uvicorn-0.14.0 dependencies, skipping because the constraint `>=7.` violates PEP440 syntax. It should either be `>=7.0` or `=7.`. Because of this, the `click` dependency is not installed and uvicorn may not work. ### To reproduce Just execute `poetry add uvicorn` in any environment. ### Expected behavior To install `uvicorn` correctly together with all its dependencies. ### Actual behavior The `click` dependency is not installed and uvicorn may not work.	[ { "content": "#!/usr/bin/env python\n# -- coding: utf-8 --\n\nimport os\nimport re\n\nfrom setuptools import setup\n\n\ndef get_version(package):\n \"\"\"\n Return package version as listed in `__version__` in `init.py`.\n \"\"\"\n path = os.path.join(package, \"__init__.py\")\n init_py = open(...	[ { "content": "#!/usr/bin/env python\n# -- coding: utf-8 --\n\nimport os\nimport re\n\nfrom setuptools import setup\n\n\ndef get_version(package):\n \"\"\"\n Return package version as listed in `__version__` in `init.py`.\n \"\"\"\n path = os.path.join(package, \"__init__.py\")\n init_py = open(...	diff --git a/setup.py b/setup.py index 1763c7764..c34317bb5 100755 --- a/setup.py +++ b/setup.py @@ -45,7 +45,7 @@ def get_packages(package): minimal_requirements = [ "asgiref>=3.4.0", - "click>=7.*", + "click>=7.0", "h11>=0.8", "typing-extensions;" + env_marker_below_38, ]
open-telemetry__opentelemetry-python-3650	Non-executable files with shebangs in the repository Describe your environment (Nothing relevant to describe) Steps to reproduce ``` $ rg -l '^#!' \| xargs ls -l -rwxr-xr-x. 1 ben ben 1420 Jul 5 2023 docs/examples/django/manage.py -rw-r--r--. 1 ben ben 1300 Jul 5 2023 docs/examples/opencensus-exporter-tracer/collector.py -rwxr-xr-x. 1 ben ben 1485 Jul 5 2023 docs/examples/opentracing/main.py -rwxr-xr-x. 1 ben ben 853 Jul 13 2023 scripts/build.sh -rwxr-xr-x. 1 ben ben 1163 Jan 22 10:06 scripts/coverage.sh -rwxr-xr-x. 1 ben ben 20741 Jul 13 2023 scripts/eachdist.py -rwxr-xr-x. 1 ben ben 215 Jul 5 2023 scripts/generate_website_docs.sh -rwxr-xr-x. 1 ben ben 2377 Jan 22 10:06 scripts/proto_codegen.sh -rwxr-xr-x. 1 ben ben 1928 Jan 22 10:06 scripts/semconv/generate.sh -rwxr-xr-x. 1 ben ben 945 Jul 5 2023 scripts/tracecontext-integration-test.sh -rw-r--r--. 1 ben ben 2519 Jan 22 11:43 tests/w3c_tracecontext_validation_server.py ``` Note that two files have shebang lines (`#!`) but do not have the executable bit set, which makes the shebang lines useless. What is the expected behavior? Files should either be non-executable and have no shebang line, or be executable and have a shebang line. What is the actual behavior? The following files are not executable and have useless shebang lines: - `docs/examples/opencensus-exporter-tracer/collector.py` - `tests/w3c_tracecontext_validation_server.py` Additional context This is a trivial thing, but I would like to fix it in a PR – either by setting the executable bit on these two files, or by removing the useless shebang lines. Both files are “script-like,” i.e. they have `if __name__ == "__main__"` or have useful side effects. Which approach would you prefer?	[ { "content": "#!/usr/bin/env python3\n#\n# Copyright The OpenTelemetry Authors\n#\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2...	[ { "content": "# Copyright The OpenTelemetry Authors\n#\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by...	diff --git a/docs/examples/opencensus-exporter-tracer/collector.py b/docs/examples/opencensus-exporter-tracer/collector.py index 5c98cc4ce9f..cd33c89617b 100644 --- a/docs/examples/opencensus-exporter-tracer/collector.py +++ b/docs/examples/opencensus-exporter-tracer/collector.py @@ -1,5 +1,3 @@ -#!/usr/bin/env python3 -# # Copyright The OpenTelemetry Authors # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/tests/w3c_tracecontext_validation_server.py b/tests/w3c_tracecontext_validation_server.py index d6c468025e4..5c47708ee1c 100644 --- a/tests/w3c_tracecontext_validation_server.py +++ b/tests/w3c_tracecontext_validation_server.py @@ -1,5 +1,3 @@ -#!/usr/bin/env python3 -# # Copyright The OpenTelemetry Authors # # Licensed under the Apache License, Version 2.0 (the "License");
dotkom__onlineweb4-1931	SSO base template should extend the base template ## What kind of an issue is this? - [x] Bug report ## What is the expected behaviour? The template for the SSO app should extend the base template so we don't have to maintain multiple base templates. ## What is the current behaviour? It's a custom template, which looks copy/pasted from the base template.	[ { "content": "# -- encoding: utf-8 --\n\nimport logging\n\nfrom django.contrib.auth.decorators import login_required\nfrom django.shortcuts import render\nfrom oauth2_provider.views.base import AuthorizationView as DefaultAuthorizationView # flake8: noqa\nfrom oauth2_provider.views.base import RevokeTokenVie...	[ { "content": "# -- encoding: utf-8 --\n\nimport logging\n\nfrom django.contrib.auth.decorators import login_required\nfrom django.shortcuts import render\nfrom oauth2_provider.views.base import AuthorizationView as DefaultAuthorizationView # flake8: noqa\nfrom oauth2_provider.views.base import RevokeTokenVie...	diff --git a/apps/sso/views.py b/apps/sso/views.py index 74494925b..b7d7fdf55 100644 --- a/apps/sso/views.py +++ b/apps/sso/views.py @@ -18,7 +18,7 @@ def index(request): context = {} - return render(request, 'sso/index.html', context) + return render(request, 'sso/authorize.html', context) class AuthorizationView(DefaultAuthorizationView): diff --git a/templates/base.html b/templates/base.html index 96ced3995..7f2a7a961 100755 --- a/templates/base.html +++ b/templates/base.html @@ -7,7 +7,7 @@ <head> <meta charset="utf-8"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> - <title>{% block title %}{% endblock %}</title> + <title>{% block title %}Online, linjeforeningen for informatikk ved NTNU{% endblock %}</title> <meta name="description" content="Online er linjeforeningen for informatikkstudentene ved NTNU. Våre studenter går Bachelor- eller Mastergradstudium i informatikk."> <link rel="icon" href="{{ STATIC_URL }}img/favicon.png"> <link rel="icon" type="image/png" href="{{ STATIC_URL }}mimg/favicon-32x32.png" sizes="32x32"> diff --git a/templates/frontpage.html b/templates/frontpage.html index 5d014b8d8..aca1cd01c 100755 --- a/templates/frontpage.html +++ b/templates/frontpage.html @@ -4,8 +4,6 @@ {% load render_bundle from webpack_loader %} -{% block title %}Online, linjeforeningen for informatikk ved NTNU{% endblock title %} - {% block styles %} {{ block.super }} {% render_bundle 'frontpage' 'css' %} diff --git a/templates/oidc_provider/authorize.html b/templates/oidc_provider/authorize.html index f5fc0e99b..e53464246 100644 --- a/templates/oidc_provider/authorize.html +++ b/templates/oidc_provider/authorize.html @@ -1,42 +1,45 @@ -{% extends "sso/index.html" %} +{% extends "sso/authorize.html" %} + {% block content %} -<div id="sso-panel"> -{% if not error %} - <div id="sso-panel-header"> - <h3>Ekstern autentisering</h3> - </div> - <div id="sso-panel-body"> - <h4>Tjenesten {{ client.name }} ønsker tilgang til denne informasjonen om deg.</h4> - <form id="sso-authorization-form" method="post" action="{% url 'oidc_provider:authorize' %}"> - {% csrf_token %} +<section id="sso-container"> + <div id="sso-panel"> + {% if not error %} + <div id="sso-panel-header"> + <h3>Ekstern autentisering</h3> + </div> + <div id="sso-panel-body"> + <h4>Tjenesten {{ client.name }} ønsker tilgang til denne informasjonen om deg.</h4> + <form id="sso-authorization-form" method="post" action="{% url 'oidc_provider:authorize' %}"> + {% csrf_token %} - {{ hidden_inputs }} + {{ hidden_inputs }} - <p>Tjenesten behøver følgende tilganger:</p> - <ul class="sso-permissions"> - {% for scope in scopes %} - <li> - <strong>{{ scope.name }}</strong> + <p>Tjenesten behøver følgende tilganger:</p> + <ul class="sso-permissions"> + {% for scope in scopes %} + <li> + <strong>{{ scope.name }}</strong> + <br /> + <i>{{ scope.description }}</i> + </li> + {% endfor %} + </ul> <br /> - <i>{{ scope.description }}</i> - </li> - {% endfor %} - </ul> - <br /> - <div id="sso-control-buttons"> - <input type="submit" class="btn btn-large btn-success" name="allow" value="Godta" /> - <input type="submit" class="btn btn-large btn-danger pull-right" value="Avslå" /> - </div> - </form> - </div> - <p class="text-center"><small><i class="glyphicon glyphicon-lock"></i> Ekstern autentisering benytter OpenID Connect og OAuth 2.0 gjennom TLS</small></p> -{% else %} - <div id="sso-panel-header"> - <h3>En feil skjedde</h3> - </div> - <div id="sso-panel-body"> - {{ error.description }} + <div id="sso-control-buttons"> + <input type="submit" class="btn btn-large btn-success" name="allow" value="Godta" /> + <input type="submit" class="btn btn-large btn-danger pull-right" value="Avslå" /> + </div> + </form> + </div> + <p class="text-center"><small><i class="glyphicon glyphicon-lock"></i> Ekstern autentisering benytter OpenID Connect og OAuth 2.0 gjennom TLS</small></p> + {% else %} + <div id="sso-panel-header"> + <h3>En feil skjedde</h3> + </div> + <div id="sso-panel-body"> + {{ error.description }} + </div> + {% endif %} </div> -{% endif %} -</div> +</section> {% endblock %} diff --git a/templates/sso/authorize.html b/templates/sso/authorize.html index f69fbda82..df8b471d0 100644 --- a/templates/sso/authorize.html +++ b/templates/sso/authorize.html @@ -1,43 +1,60 @@ -{% extends "sso/index.html" %} +{% extends 'base.html' %} + +{% load chunks %} + +{% load render_bundle from webpack_loader %} + +{% block styles %} + {{ block.super }} + {% render_bundle 'sso' 'css' %} +{% endblock %} + +{% block js %} + {{ block.super }} + {% render_bundle 'sso' 'js' %} +{% endblock %} + {% block content %} -<div id="sso-panel"> -{% if not error %} - <div id="sso-panel-header"> - <h3>Ekstern autentisering</h3> - </div> - <div id="sso-panel-body"> - <h4>Tjenesten {{ application.name }} ønsker innloggingsinformasjon.</h4> - <form id="sso-authorization-form" method="post"> - {% csrf_token %} - {% for field in form %} - {% if field.is_hidden %} - {{ field }} - {% endif %} - {% endfor %} - <p>Tjenesten behøver følgende tilganger:</p> - <ul class="sso-permissions"> - {% for scope in scopes_descriptions %} - <li>{{ scope }}</li> +<section id="sso-container"> + <div id="sso-panel"> + {% if not error %} + <div id="sso-panel-header"> + <h3>Ekstern autentisering</h3> + </div> + <div id="sso-panel-body"> + <h4>Tjenesten {{ application.name }} ønsker innloggingsinformasjon.</h4> + <form id="sso-authorization-form" method="post"> + {% csrf_token %} + {% for field in form %} + {% if field.is_hidden %} + {{ field }} + {% endif %} {% endfor %} - </ul> - <br /> - <div id="sso-control-buttons"> - <input type="submit" class="btn btn-large btn-success" name="allow" value="Godta" /> - <input type="submit" class="btn btn-large btn-danger pull-right" value="Avslå" /> - </div> - </form> - </div> - <p class="text-center"><small><i class="fa fa-lock"></i> Ekstern autentisering benytter OAuth 2.0 gjennom TLS</small></p> -{% else %} - <div id="sso-panel-header"> - <h3>En feil skjedde</h3> - </div> - <div id="sso-panel-body"> - {{ error.description }} + <p>Tjenesten behøver følgende tilganger:</p> + <ul class="sso-permissions"> + {% for scope in scopes_descriptions %} + <li>{{ scope }}</li> + {% endfor %} + </ul> + <br /> + <div id="sso-control-buttons"> + <input type="submit" class="btn btn-large btn-success" name="allow" value="Godta" /> + <input type="submit" class="btn btn-large btn-danger pull-right" value="Avslå" /> + </div> + </form> + </div> + <p class="text-center"><small><i class="fa fa-lock"></i> Ekstern autentisering benytter OAuth 2.0 gjennom TLS</small></p> + {% else %} + <div id="sso-panel-header"> + <h3>En feil skjedde</h3> + </div> + <div id="sso-panel-body"> + {{ error.description }} + </div> + {% endif %} </div> -{% endif %} -</div> -<br /> -<br /> -<p class="text-center">Les mer om bruken av <i><a href="/wiki/">Ekstern Autentisering</a></i> på wikien.</p> + <br /> + <br /> + <p class="text-center">Les mer om bruken av <i><a href="/wiki/">Ekstern Autentisering</a></i> på wikien.</p> +</section> {% endblock %} diff --git a/templates/sso/index.html b/templates/sso/index.html deleted file mode 100644 index 09777a664..000000000 --- a/templates/sso/index.html +++ /dev/null @@ -1,198 +0,0 @@ -{% load render_bundle from webpack_loader %} -<!DOCTYPE html> -<html> -<head> - <meta charset="utf-8"> - <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> - <title>{% block title %}{% endblock %}</title> - <meta name="description" content="Online er linjeforeningen for informatikkstudentene ved NTNU. Våre studenter går Bachelor- eller Mastergradstudium i informatikk."> - <link rel="icon" href="{{ STATIC_URL }}img/favicon.png"> - <meta name="viewport" content="width=device-width, initial-scale=1.0"> - {% block styles %} - {% render_bundle 'common' 'css' %} - {% render_bundle 'core' 'css' %} - {% render_bundle 'sso' 'css' %} - {% endblock %} -</head> -<body> - <nav id="mainnav"> - <div class="container"> - <ul class="mn-collapse"> - <li> - <button id="mainnav-button"> - <svg x="0px" y="0px" width="100%" viewBox="0 0 96 96" class="mn-svg" enable-background="new 0 0 96 96"> - <rect width="32" height="4" x="32" y="46" class="mn-svg-rect-top"></rect> - </svg> - <svg x="0px" y="0px" width="100%" viewBox="0 0 96 96" class="mn-svg" enable-background="new 0 0 96 96"> - <rect width="32" height="4" x="32" y="46" class="mn-svg-rect-bottom"></rect> - </svg> - </button> - </li> - <li> - <a href="{% url 'home' %}"> - <img src="{{ STATIC_URL }}img/online_logo.svg" alt="Online" class="online-logo"> - </a> - </li> - </ul> - <ul class="mn-nav"> - <li><a class="online-logo-link" href="{% url 'home' %}"><img src="{{ STATIC_URL }}img/online_logo.svg" alt="Online"></a></li> - <li><a href="{% url 'events_index' %}">Arkiv</a></li> - <li><a href="{% url 'careeropportunity_index' %}">Karriere</a></li> - <li><a href="{% url 'resourcecenter_index' %}">Ressurser</a></li> - <li><a href="/wiki/">Wiki</a></li> - </ul> - <ul class="mn-user-nav"> - {% if user.is_authenticated %} - <li> - <a href="#login_menu" class="dropdown-toggle dropdown-signin login glyphicon glyphicon-user" data-toggle="dropdown"></a> - <span class="username_menu hidden-xs hidden-sm hidden-md">{{ user.username }}</span> - - <ul class="dropdown-menu login-box" role="menu"> - - {% if user.is_staff %} - <li><a href="/admin/">Administrasjon</a></li> - {% endif %} - <li><a href="{% url 'profiles' %}">Min side<span class="hidden-lg">: {{ user.username }}</span></a></li> - <li><a href="{% url 'profiles_user_search' %}">Finn brukere</a></li> - <li class="divider"></li> - <li><a href="{% url 'auth_logout' %}">Logg ut</a></li> - </ul> - </li> - {% else %} - <li> - <a href="#login_menu" class="dropdown-toggle dropdown-signin login glyphicon glyphicon-lock" data-toggle="dropdown"></a> - <ul class="dropdown-menu login-box" role="menu"> - <li> - <form class="navbar-form" method="POST" action="{% url 'auth_login' %}"> - {% csrf_token %} - <fieldset class="textbox"> - <div class="input-group"> - <label for="id_username">Brukernavn</label> - <input type="text" name="username" id="id_username" class="form-control"> - </div> - <div class="input-group"> - <label for="id_password">Passord</label> - <input type="password" name="password" id="id_password" class="form-control"> - </div> - </fieldset> - <input type="hidden" name="next" value="{{ request.get_full_path }}" /> - <button type="submit" class="btn btn-primary">Logg inn</button> - </form> - <div id="login-form-btn-group"> - <a class="btn btn-default" href="{% url 'auth_register' %}">Registrer</a> - <a class="btn btn-default" href="{% url 'auth_recover' %}">Glemt passord</a> - </div> - </li> - </ul> - </li> - {% endif %} - </ul> - - <div id="main-sponsor"> - <a href="http://www.soprasteria.no/"> - <img class="ms-img" src="{{ STATIC_URL }}img/soprasteria.svg" alt="Hovedsamarbeidspartner - Sopra Steria"> - </a> - <span class="ms-span">Hovedsamarbeidspartner</span> - </div> - </ul> - </div> - </nav> - <section id="sso-container"> - {% block content %}{% endblock %} - </section> - <section id="footer"> - <div class="container"> - <div class="row"> - <div class="col-xs-12 col-sm-6 col-md-4"> - <div class="row row-space"> - <div class="col-md-12 footer-social"> - <a href="http://facebook.com/LinjeforeningenOnline" class="socialIcon-link"> - <img src="{{ STATIC_URL }}img/social/facebook.svg" alt="Facebook"> - </a> - <a href="http://twitter.com/Online_NTNU" class="socialIcon-link"> - <img src="{{ STATIC_URL }}img/social/twitter.svg" alt="Twitter"> - </a> - <a href="https://www.instagram.com/online_ntnu/" class="socialIcon-link"> - <img src="{{ STATIC_URL }}img/social/instagram.svg" alt="Instagram"> - </a> - <a href="https://www.github.com/dotkom/" class="socialIcon-link"> - <img src="{{ STATIC_URL }}img/social/github.svg" alt="Github"> - </a> - <a href="https://plus.google.com/107294836198591872251" class="socialIcon-link"> - <img src="{{ STATIC_URL }}img/social/gpluss.svg" alt="Google Plus"> - </a> - </div> - </div> - <div class="row"> - <div class="col-md-12"> - <p>Har du funnet en feil på nettsiden?<br>Ta kontakt med <a href="mailto:dotkom@online.ntnu.no">Utviklingsteamet</a></p> - </div> - </div> - </div> - <div class="col-xs-12 col-sm-6 col-md-4"> - <div class="row"> - <div class="col-md-12"> - <div class="contact-info"> - <div class="contact-item"> - <span class="glyphicon glyphicon-briefcase"></span>992 548 045 (OrgNr) - </div> - <div class="contact-item"> - <span class="glyphicon glyphicon-envelope"></span>kontakt@online.ntnu.no - </div> - <div class="contact-item"> - <span class="glyphicon glyphicon-phone"></span>73 59 64 89 - </div> - </div> - </div> - </div> - <div class="row"> - <div class="col-xs-6 col-sm-6 col-md-6"> - <div class="address"> - <div class="address-heading">Besøksadresse <span class="glyphicon glyphicon-map-marker"></span></div> - <div class="address-info"> - Rom 303<br> - Høgskoleringen 3<br> - NTNU Gløshaugen - </div> - </div> - </div> - <div class="col-xs-6 col-sm-6 col-md-6"> - <div class="address"> - <div class="address-heading">Postadresse <span class="glyphicon glyphicon-map-marker"></span></div> - <div class="address-info"> - Online Linjeforening<br> - Sem Sælandsv. 9<br> - 7491 Trondheim<br> - </div> - </div> - </div> - </div> - </div> - <div class="col-xs-12 col-md-4"> - <div id="footer-map"></div> - </div> - </div> - </div> - </section> - - {% block js %} - <script src="https://maps.googleapis.com/maps/api/js?v=3&sensor=true"></script> - {% render_bundle 'common' 'js' %} - {% render_bundle 'core' 'js' %} - {% render_bundle 'sso' 'js' %} - {% endblock %} - - {% if GOOGLE_ANALYTICS_KEY %} - <script type="text/javascript"> - var _gaq = _gaq \|\| []; - _gaq.push(['_setAccount', '{{ GOOGLE_ANALYTICS_KEY }}']); - _gaq.push(['_trackPageview']); - (function() { - var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; - ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; - var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); - })(); - </script> - {% endif %} - </body> -</html>
dotkom__onlineweb4-1281	Separate requirements in develop, testing and production We should separate requirements for various environments. What sparked this was requiring some postgresql magic to install all requirements (`psycopg2`), and e.g. moonshine does not want postgres just for tests to pass (or run, for that matter). Requirements that should be removed from `requirements.txt` and added to `requirements-<env>.txt`: #### Production requirements [src](https://github.com/dotKom/onlineweb4/blob/develop/requirements.txt#L9): - `psycopg2` (yes, some people use postgres in development. However, example-local.py uses sqlite and most people will therefore not need this package. 1) #### Testing requirements [src](https://github.com/dotKom/onlineweb4/blob/develop/requirements.txt#L38): - `cov-core` - `coverage` - `django-nose` - `factory-boy` - `lettuce` - `nose` 2 - `nose-cov` - `teamcity-messages` #### Development requirements (these can be/should be fully optional) - `django-debug-toolbar` (it's not in `requirements.txt` as of now, but maybe it should? [wiki](https://github.com/dotKom/onlineweb4/wiki/Django-debug-toolbar)) 1: It also fails to install and stops requirements.txt installation if people don't have postgresql dev headers ([ex.](https://online.ntnu.no/tc/viewLog.html?tab=buildLog&buildTypeId=Onlineweb4_Build&buildId=29)) 2: If we remove this one we have to change default runner class in base settings as the current testrunner is nose.	[ { "content": "# -- coding: utf8 --\nimport os\nimport sys\n\nimport wiki\nfrom django.contrib.messages import constants as messages\n\n# Directory that contains this file.\nPROJECT_SETTINGS_DIRECTORY = os.path.dirname(globals()['__file__'])\n# Root directory. Contains manage.py\nPROJECT_ROOT_DIRECTORY = os.pa...	[ { "content": "# -- coding: utf8 --\nimport os\nimport sys\n\nimport wiki\nfrom django.contrib.messages import constants as messages\n\n# Directory that contains this file.\nPROJECT_SETTINGS_DIRECTORY = os.path.dirname(globals()['__file__'])\n# Root directory. Contains manage.py\nPROJECT_ROOT_DIRECTORY = os.pa...	diff --git a/onlineweb4/settings/base.py b/onlineweb4/settings/base.py index 565de0a3c..f7b3961b5 100644 --- a/onlineweb4/settings/base.py +++ b/onlineweb4/settings/base.py @@ -219,7 +219,6 @@ 'compressor', 'pdfdocument', 'watson', - 'gunicorn', 'markdown_deux', 'djangoformsetjs', 'reversion', diff --git a/requirements-prod.txt b/requirements-prod.txt new file mode 100644 index 000000000..e116f5559 --- /dev/null +++ b/requirements-prod.txt @@ -0,0 +1,2 @@ +gunicorn==19.0 # Used as a http server in production +psycopg2 # Postgres adapter diff --git a/requirements-testing.txt b/requirements-testing.txt new file mode 100644 index 000000000..18c7c3290 --- /dev/null +++ b/requirements-testing.txt @@ -0,0 +1,8 @@ +cov-core>=1.7 +coverage>=4.0.1 +factory-boy>=1.1.3 +lettuce>=0.2.20 +nose-cov>=1.6 +teamcity-messages>=1.16 +flake8>=2.4.1 +pepper8>=1.0.4 # Transforms flake8 output to HTML report + TC messages diff --git a/requirements.txt b/requirements.txt index 8195d3af7..4c25ac940 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,9 +7,7 @@ django-filter==0.11.0 # Filtering for DRF # Upstream is missing Python 3 patches git+https://github.com/JelteF/python-memcached@patch-1#egg=python-memcached==1.58 markdown2==2.3.0 # textarea text formatting -psycopg2 # Postgres adapter -pytz # Timezone lib. Obsolete? -gunicorn==19.0 +pytz # Timezone lib icalendar==3.8.4 stripe==1.20.2 @@ -39,21 +37,12 @@ pdfdocument==3.1 Unidecode==0.4.17 # Translates every unicode symbol to the closest ascii. online_mail_usernames django-markdown-deux==1.0.5 django-formset-js==0.4.3 -werkzeug==0.10.4 django-cors-headers==1.1.0 # Enable CORS for Nibble django-datetime-widget==0.9.3 # Datetime widget for forms #test tools -cov-core==1.7 -coverage==4.0.1 -django-nose>=1.4,<1.5 -factory-boy==1.1.3 -lettuce==0.2.20 -nose==1.3.4 -nose-cov==1.6 -teamcity-messages==1.16 -flake8==2.4.1 -pepper8>=1.0.4 # Transforms flake8 output to HTML report + TC messages +django-nose>=1.4,<1.5 # We use this test runner locally +nose==1.3.4 # We use this test runner locally # Frigg requests[security]==2.8.0 @@ -71,4 +60,3 @@ django-sekizai>=0.9 # imagemagick # From package repository. Tested with version == 8:6.7.7.10. # libjpeg-dev # From package repository. # libpq-dev # From package repository. - diff --git a/tox.ini b/tox.ini index bf7efaf24..ba0dc21bf 100644 --- a/tox.ini +++ b/tox.ini @@ -15,7 +15,9 @@ commands = coverage: coverage xml [testenv:tests] -deps = -r{toxinidir}/requirements.txt +deps = + -r{toxinidir}/requirements.txt + -r{toxinidir}/requirements-testing.txt whitelist_externals = /bin/cp setenv =
apache__airflow-22886	Databricks SQL fails on Python 3.10 ### Apache Airflow Provider(s) databricks ### Versions of Apache Airflow Providers The databricks SQL does not work on Python 3.10 due to "from collections import Iterable" in the `databricks-sql-connector` * https://pypi.org/project/databricks-sql-connector/ Details of this issue dicussed in https://github.com/apache/airflow/pull/22050 For now we will likely just exclude the tests (and mark databricks provider as non-python 3.10 compatible). But once this is fixed (in either 1.0.2 or upcoming 2.0.0 version of the library, we wil restore it back). ### Apache Airflow version main (development) ### Operating System All ### Deployment Other ### Deployment details Just Breeze with Python 3.10 ### What happened The tests are failing: ``` self = <databricks.sql.common.ParamEscaper object at 0x7fe81c6dd6c0> item = ['file1', 'file2', 'file3'] def escape_item(self, item): if item is None: return 'NULL' elif isinstance(item, (int, float)): return self.escape_number(item) elif isinstance(item, basestring): return self.escape_string(item) > elif isinstance(item, collections.Iterable): E AttributeError: module 'collections' has no attribute 'Iterable' ``` https://github.com/apache/airflow/runs/5523057543?check_suite_focus=true#step:8:16781 ### What you expected to happen Test succeed :) ### How to reproduce Run `TestDatabricksSqlCopyIntoOperator` in Python 3.10 environment. ### Anything else _No response_ ### Are you willing to submit PR? - [X] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://github.com/apache/airflow/blob/main/CODE_OF_CONDUCT.md)	[ { "content": "#\n# Licensed to the Apache Software Foundation (ASF) under one\n# or more contributor license agreements. See the NOTICE file\n# distributed with this work for additional information\n# regarding copyright ownership. The ASF licenses this file\n# to you under the Apache License, Version 2.0 (th...	[ { "content": "#\n# Licensed to the Apache Software Foundation (ASF) under one\n# or more contributor license agreements. See the NOTICE file\n# distributed with this work for additional information\n# regarding copyright ownership. The ASF licenses this file\n# to you under the Apache License, Version 2.0 (th...	diff --git a/airflow/providers/databricks/provider.yaml b/airflow/providers/databricks/provider.yaml index 3aba329e4d89d..4afbc0c5357db 100644 --- a/airflow/providers/databricks/provider.yaml +++ b/airflow/providers/databricks/provider.yaml @@ -37,9 +37,6 @@ versions: additional-dependencies: - apache-airflow>=2.1.0 -excluded-python-versions: - - "3.10" - integrations: - integration-name: Databricks external-doc-url: https://databricks.com/ diff --git a/docs/apache-airflow-providers-databricks/index.rst b/docs/apache-airflow-providers-databricks/index.rst index 56836078c2516..51c8381f0c20c 100644 --- a/docs/apache-airflow-providers-databricks/index.rst +++ b/docs/apache-airflow-providers-databricks/index.rst @@ -80,7 +80,7 @@ PIP requirements PIP package Version required ============================ =================== ``apache-airflow`` ``>=2.1.0`` -``databricks-sql-connector`` ``>=1.0.0, <2.0.0`` +``databricks-sql-connector`` ``>=1.0.2, <2.0.0`` ``requests`` ``>=2.26.0, <3`` ============================ =================== diff --git a/setup.py b/setup.py index e18cef450fd88..950285353f0ce 100644 --- a/setup.py +++ b/setup.py @@ -264,7 +264,7 @@ def write_version(filename: str = os.path.join(*[my_dir, "airflow", "git_version ] databricks = [ 'requests>=2.26.0, <3', - 'databricks-sql-connector>=1.0.0, <2.0.0', + 'databricks-sql-connector>=1.0.2, <2.0.0', ] datadog = [ 'datadog>=0.14.0', diff --git a/tests/providers/databricks/operators/test_databricks_sql.py b/tests/providers/databricks/operators/test_databricks_sql.py index 08e24d72d8012..6b9fb43701ae3 100644 --- a/tests/providers/databricks/operators/test_databricks_sql.py +++ b/tests/providers/databricks/operators/test_databricks_sql.py @@ -24,7 +24,7 @@ import pytest from databricks.sql.types import Row -from airflow import PY310, AirflowException +from airflow import AirflowException from airflow.providers.databricks.operators.databricks_sql import ( DatabricksCopyIntoOperator, DatabricksSqlOperator, @@ -83,12 +83,6 @@ def test_exec_write_file(self, db_mock_class): db_mock.run.assert_called_once_with(sql, parameters=None) -@pytest.mark.skipif( - PY310, - reason="Databricks SQL tests not run on Python 3.10 because there is direct Iterable import from" - " collections in the databricks SQL library, where it should be imported from collections.abc." - " This could be removed when https://github.com/apache/airflow/issues/22220 is solved", -) class TestDatabricksSqlCopyIntoOperator(unittest.TestCase): def test_copy_with_files(self): op = DatabricksCopyIntoOperator(
zestedesavoir__zds-site-2605	[Bêta v1.8] Les flux rss ne fonctionnent plus => erreur 500 En direct de la beta, il est impossible d'avoir les flux rss en cliquant sur les liens correspondant. On se prend une erreur 500. C'est donc une regression, puisque ça marche en prod.	[ { "content": "# coding: utf-8\n\nimport os\n\nfrom django.utils.translation import gettext_lazy as _\n\n# Build paths inside the project like this: os.path.join(BASE_DIR, ...)\nBASE_DIR = os.path.dirname(os.path.dirname(__file__))\n\nDEBUG = True\nTEMPLATE_DEBUG = DEBUG\n# INTERNAL_IPS = ('127.0.0.1',) # debug...	[ { "content": "# coding: utf-8\n\nimport os\n\nfrom django.utils.translation import gettext_lazy as _\n\n# Build paths inside the project like this: os.path.join(BASE_DIR, ...)\nBASE_DIR = os.path.dirname(os.path.dirname(__file__))\n\nDEBUG = True\nTEMPLATE_DEBUG = DEBUG\n# INTERNAL_IPS = ('127.0.0.1',) # debug...	diff --git a/zds/settings.py b/zds/settings.py index 3d94cba83f..d0d2f33de1 100644 --- a/zds/settings.py +++ b/zds/settings.py @@ -176,6 +176,8 @@ # 'django.contrib.admindocs', ) +SITE_ID = 1 + THUMBNAIL_ALIASES = { '': { 'avatar': {'size': (60, 60), 'crop': True},
Gallopsled__pwntools-1811	List comprehension in __all__ prevents Pylance from working Thanks for contributing to Pwntools! Ideas from the community help make Pwntools an amazing tool for everybody. If you've got an idea for a new feature, please provide information about: * What the feature does According to https://github.com/microsoft/pylance-release/issues/289, the list comprehension in `__all__` in https://github.com/Gallopsled/pwntools/blob/4e6ccb0da17fb91e43a4f9e95edf4fd83806ba23/pwn/toplevel.py#L85 prevents [Pylance](https://marketplace.visualstudio.com/items?itemName=ms-python.vscode-pylance) from working (when using `from pwn import ` instead of manually importing all modules). https://github.com/compas-dev/compas/issues/621 may be a solution instead of listing all attributes manually to fix that. Why the feature should exist To make Pylance happy :smile: * What tests should be included Test in VS Code to ensure it works. If you think you can write the feature yourself, please submit a Pull Request and we can review your changes!	[ { "content": "# Get all the modules from pwnlib\nimport collections\nimport logging\nimport math\nimport operator\nimport os\nimport platform\nimport re\nimport requests\nimport socks\nimport signal\nimport string\nimport struct\nimport subprocess\nimport sys\nimport tempfile\nimport threading\nimport time\n\nf...	[ { "content": "# Get all the modules from pwnlib\nimport collections\nimport logging\nimport math\nimport operator\nimport os\nimport platform\nimport re\nimport requests\nimport socks\nimport signal\nimport string\nimport struct\nimport subprocess\nimport sys\nimport tempfile\nimport threading\nimport time\n\nf...	diff --git a/CHANGELOG.md b/CHANGELOG.md index ba2970645..4929c0906 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -68,6 +68,7 @@ The table below shows which release corresponds to each branch, and what date th - [#1758][1758] Remove eval from cli - [#1780][1780] Re-add Python2 to the official Dockerfile - [#1941][1941] Disable all Android tests, `pwnlib.adb` is no longer supported in CI +- [#1811][1811] Remove unnecessary `pwn.toplevel.__all__` [1261]: https://github.com/Gallopsled/pwntools/pull/1261 [1695]: https://github.com/Gallopsled/pwntools/pull/1695 @@ -78,7 +79,7 @@ The table below shows which release corresponds to each branch, and what date th [1758]: https://github.com/Gallopsled/pwntools/pull/1758 [1780]: https://github.com/Gallopsled/pwntools/pull/1780 [1941]: https://github.com/Gallopsled/pwntools/pull/1941 -[1786]: https://github.com/Gallopsled/pwntools/pull/1786 +[1811]: https://github.com/Gallopsled/pwntools/pull/1811 ## 4.4.0 (`beta`) diff --git a/pwn/toplevel.py b/pwn/toplevel.py index 0cc3f7509..5af57bf55 100644 --- a/pwn/toplevel.py +++ b/pwn/toplevel.py @@ -83,4 +83,5 @@ debug = log.debug success = log.success -__all__ = [x for x in tuple(globals()) if x != '__name__'] +# Equivalence with the default behavior of "from import *" +# __all__ = [x for x in tuple(globals()) if not x.startswith('_')]
searx__searx-1477	New release? Hi, I'm the Debian maintainer of searx and we are still shipping version 0.14.0 of searx because there has not been a more recent release since February. Unfortunately, we see a number of services that do not work anymore with 0.14.0 but which are fixed in git. Would it be possible to make a release soon? The last commit to the repository was back in August. Is the project still alive? Debian plans to release its next stable version soon and we should not include searx if it's not maintained anymore. Thanks! cheers, josch	[ { "content": "# -- coding: utf-8 --\n'''\nsearx is free software: you can redistribute it and/or modify\nit under the terms of the GNU Affero General Public License as published by\nthe Free Software Foundation, either version 3 of the License, or\n(at your option) any later version.\n\nsearx is distributed i...	[ { "content": "# -- coding: utf-8 --\n'''\nsearx is free software: you can redistribute it and/or modify\nit under the terms of the GNU Affero General Public License as published by\nthe Free Software Foundation, either version 3 of the License, or\n(at your option) any later version.\n\nsearx is distributed i...	diff --git a/AUTHORS.rst b/AUTHORS.rst index 346f324d5d..674bfd758a 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -83,3 +83,18 @@ generally made searx better: - Joseph Nuthalapati @josephkiranbabu - @maiki - Richard Didier @zeph33 +- Michael Vieria @Themimitoof +- Richard Nespithal @rndevfx +- Stanislas @angristan +- @rinpatch +- g. s. @usernameisntallowed +- Léo Bourrel @bourrel +- @cy8aer +- @Popolon +- Alice Ferrazzi @aliceinwire +- @LiquidLemon +- @dadosch +- @Venca24 +- @ZEROF +- Ivan Skytte Jørgensen @isj-privacore +- @miicha diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 55bd33ee85..70e9e415cc 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,3 +1,41 @@ +0.15.0 2019.01.06 +================= + +- New engines + + - Acgsou (files, images, videos, music) + - Duden.de (general) + - Seznam (general) + - Mojeek (general) +- New languages + + - Catalan + - Welsh + - Basque + - Persian (Iran) + - Galician + - Dutch (Belgium) + - Telugu + - Vietnamese +- New random answerers + + - sha256 + - uuidv4 +- New DOI resolsvers + + - sci-hub.tw +- Fix Vim mode on Firefox +- Fix custom select in Oscar theme +- Engine fixes (duckduckgo, google news, currency convert, gigablast, google scholar, wikidata image, etymonline, google videos, startpage, bing image) +- Minor simple theme fixes + +- New Youtube icon in Oscar theme +- Get DOI rewriters from settings.yml +- Hide page buttons when infinite scrolling is enabled +- Update user agent versions +- Make Oscar style configurable +- Make suspend times of errored engines configurable + 0.14.0 2018.02.19 ================= diff --git a/searx/settings.yml b/searx/settings.yml index 35172bd6a6..00b001b6ce 100644 --- a/searx/settings.yml +++ b/searx/settings.yml @@ -742,21 +742,27 @@ locales: en : English ar : العَرَبِيَّة (Arabic) bg : Български (Bulgarian) + ca : Català (Catalan) cs : Čeština (Czech) + cy : Cymraeg (Welsh) da : Dansk (Danish) de : Deutsch (German) el_GR : Ελληνικά (Greek_Greece) eo : Esperanto (Esperanto) es : Español (Spanish) + eu : Euskara (Basque) + fa_IR : (fārsī) فارسى (Persian) fi : Suomi (Finnish) fil : Wikang Filipino (Filipino) fr : Français (French) + gl : Galego (Galician) he : עברית (Hebrew) hr : Hrvatski (Croatian) hu : Magyar (Hungarian) it : Italiano (Italian) ja : 日本語 (Japanese) nl : Nederlands (Dutch) + nl_BE : Vlaams (Dutch_Belgium) pl : Polski (Polish) pt : Português (Portuguese) pt_BR : Português (Portuguese_Brazil) @@ -766,8 +772,10 @@ locales: sl : Slovenski (Slovene) sr : српски (Serbian) sv : Svenska (Swedish) + te : తెలుగు (telugu) tr : Türkçe (Turkish) uk : українська мова (Ukrainian) + vi : tiếng việt (㗂越) zh : 中文 (Chinese) zh_TW : 國語 (Taiwanese Mandarin) diff --git a/searx/translations/ar/LC_MESSAGES/messages.mo b/searx/translations/ar/LC_MESSAGES/messages.mo index b3579a1a71..052e5b5225 100644 Binary files a/searx/translations/ar/LC_MESSAGES/messages.mo and b/searx/translations/ar/LC_MESSAGES/messages.mo differ diff --git a/searx/translations/ar/LC_MESSAGES/messages.po b/searx/translations/ar/LC_MESSAGES/messages.po index 4d7e55fe4d..645ca0ed6a 100644 --- a/searx/translations/ar/LC_MESSAGES/messages.po +++ b/searx/translations/ar/LC_MESSAGES/messages.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PROJECT project. # # Translators: -# ButterflyOfFire <ButterflyOfFire@protonmail.com>, 2017-2018 +# ButterflyOfFire ButterflyOfFire, 2018 +# ButterflyOfFire, 2017-2018 msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" "POT-Creation-Date: 2017-11-01 21:31+0100\n" -"PO-Revision-Date: 2018-01-23 17:54+0000\n" -"Last-Translator: ButterflyOfFire <ButterflyOfFire@protonmail.com>\n" +"PO-Revision-Date: 2018-09-08 08:23+0000\n" +"Last-Translator: ButterflyOfFire ButterflyOfFire\n" "Language-Team: Arabic (http://www.transifex.com/asciimoo/searx/language/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,7 +30,7 @@ msgstr "" #: searx/search.py:151 msgid "unexpected crash" -msgstr "" +msgstr "خلل غير مُتوقّع" #: searx/webapp.py:136 msgid "files" @@ -73,7 +74,7 @@ msgstr "علوم" #: searx/webapp.py:399 searx/webapp.py:658 msgid "Invalid settings, please edit your preferences" -msgstr "" +msgstr "إنّ الإعدادات خاطئة، يرجى تعديل خياراتك" #: searx/webapp.py:415 msgid "Invalid settings" @@ -97,7 +98,7 @@ msgstr "مولّد قيمة عشوائية" #: searx/answerers/random/answerer.py:54 msgid "Generate different random values" -msgstr "" +msgstr "توليد قِيم عشوائية مختلفة" #: searx/answerers/statistics/answerer.py:53 msgid "Statistics functions" @@ -288,7 +289,7 @@ msgstr "اللغة الإفتراضية" #: searx/templates/pix-art/preferences.html:20 #: searx/templates/simple/preferences.html:120 msgid "Interface language" -msgstr "لغة العرض" +msgstr "لغة الواجهة" #: searx/templates/courgette/preferences.html:34 #: searx/templates/legacy/preferences.html:35 @@ -371,7 +372,7 @@ msgstr "اللون" #: searx/templates/courgette/preferences.html:86 msgid "Blue (default)" -msgstr "أزرق )إفتراضي(" +msgstr "أزرق (إفتراضي)" #: searx/templates/courgette/preferences.html:87 msgid "Violet" @@ -581,13 +582,13 @@ msgstr "عرض نتائج البحث في ألسنة جديدة" #: searx/templates/oscar/preferences.html:117 #: searx/templates/simple/preferences.html:145 msgid "On" -msgstr "" +msgstr "يشتغل" #: searx/templates/legacy/preferences.html:88 #: searx/templates/oscar/preferences.html:118 #: searx/templates/simple/preferences.html:146 msgid "Off" -msgstr "" +msgstr "مُعطَّل" #: searx/templates/legacy/result_templates/code.html:3 #: searx/templates/legacy/result_templates/default.html:3 @@ -626,7 +627,7 @@ msgstr "محرك بحث يحمي الخصوصية و قابل للتهكير" #: searx/templates/oscar/macros.html:36 searx/templates/oscar/macros.html:50 #: searx/templates/simple/macros.html:43 msgid "proxied" -msgstr "يمر عبر البروكسي" +msgstr "النفاذ عبر البروكسي" #: searx/templates/oscar/macros.html:92 msgid "supported" @@ -661,7 +662,7 @@ msgstr "المجيبون" #: searx/templates/oscar/preferences.html:17 #: searx/templates/oscar/preferences.html:272 msgid "Cookies" -msgstr "الكوكيز" +msgstr "كعكات الكوكيز" #: searx/templates/oscar/preferences.html:42 #: searx/templates/simple/preferences.html:48 @@ -676,12 +677,12 @@ msgstr "يقوم بتغيير لغة واجهة البحث" #: searx/templates/oscar/preferences.html:58 #: searx/templates/simple/preferences.html:60 msgid "Find stuff as you type" -msgstr "" +msgstr "العثور على نتائج أثناء الكتابة" #: searx/templates/oscar/preferences.html:69 #: searx/templates/simple/preferences.html:173 msgid "Proxying image results through searx" -msgstr "" +msgstr "تمرير نتائج البحث عن الصور عبر بروكسي Searx" #: searx/templates/oscar/preferences.html:78 msgid "" @@ -865,7 +866,7 @@ msgstr "معلومة !" #: searx/templates/oscar/messages/no_cookies.html:4 msgid "currently, there are no cookies defined." -msgstr "" +msgstr "حاليا لم تقم بتحديد أي مِن كعكات الكوكيز." #: searx/templates/oscar/messages/no_data_available.html:4 msgid "There is currently no data available. " diff --git a/searx/translations/bg/LC_MESSAGES/messages.mo b/searx/translations/bg/LC_MESSAGES/messages.mo index 63b303a423..f80e5afcc9 100644 Binary files a/searx/translations/bg/LC_MESSAGES/messages.mo and b/searx/translations/bg/LC_MESSAGES/messages.mo differ diff --git a/searx/translations/ca/LC_MESSAGES/messages.mo b/searx/translations/ca/LC_MESSAGES/messages.mo new file mode 100644 index 0000000000..2ec3e05030 Binary files /dev/null and b/searx/translations/ca/LC_MESSAGES/messages.mo differ diff --git a/searx/translations/ca/LC_MESSAGES/messages.po b/searx/translations/ca/LC_MESSAGES/messages.po new file mode 100644 index 0000000000..460091cd7b --- /dev/null +++ b/searx/translations/ca/LC_MESSAGES/messages.po @@ -0,0 +1,1014 @@ +# Translations template for PROJECT. +# Copyright (C) 2017 ORGANIZATION +# This file is distributed under the same license as the PROJECT project. +# +# Translators: +# Calbasi <joan@calbasi.net>, 2018 +# jmontane, 2018 +msgid "" +msgstr "" +"Project-Id-Version: searx\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2017-11-01 21:31+0100\n" +"PO-Revision-Date: 2018-12-15 15:10+0000\n" +"Last-Translator: jmontane\n" +"Language-Team: Catalan (http://www.transifex.com/asciimoo/searx/language/ca/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 2.3.4\n" +"Language: ca\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: searx/search.py:137 searx/search.py:182 +msgid "timeout" +msgstr "s'ha esgotat el temps d'espera" + +#: searx/search.py:144 +msgid "request exception" +msgstr "Excepció en la petició" + +#: searx/search.py:151 +msgid "unexpected crash" +msgstr "Fallada no esperada" + +#: searx/webapp.py:136 +msgid "files" +msgstr "fitxers" + +#: searx/webapp.py:137 +msgid "general" +msgstr "general" + +#: searx/webapp.py:138 +msgid "music" +msgstr "música" + +#: searx/webapp.py:139 +msgid "social media" +msgstr "xarxes socials" + +#: searx/webapp.py:140 +msgid "images" +msgstr "imatges" + +#: searx/webapp.py:141 +msgid "videos" +msgstr "vídeos" + +#: searx/webapp.py:142 +msgid "it" +msgstr "informàtica" + +#: searx/webapp.py:143 +msgid "news" +msgstr "notícies" + +#: searx/webapp.py:144 +msgid "map" +msgstr "mapa" + +#: searx/webapp.py:145 +msgid "science" +msgstr "ciència" + +#: searx/webapp.py:399 searx/webapp.py:658 +msgid "Invalid settings, please edit your preferences" +msgstr "La configuració no és vàlida, editeu-la" + +#: searx/webapp.py:415 +msgid "Invalid settings" +msgstr "La configuració no és vàlida" + +#: searx/webapp.py:449 searx/webapp.py:493 +msgid "search error" +msgstr "error en la cerca" + +#: searx/webapp.py:530 +msgid "{minutes} minute(s) ago" +msgstr "fa {minutes} minuts" + +#: searx/webapp.py:532 +msgid "{hours} hour(s), {minutes} minute(s) ago" +msgstr "fa {hours} hores i {minutes} minuts" + +#: searx/answerers/random/answerer.py:53 +msgid "Random value generator" +msgstr "Generador de valor aleatori" + +#: searx/answerers/random/answerer.py:54 +msgid "Generate different random values" +msgstr "Genera valors aleatoris diferents" + +#: searx/answerers/statistics/answerer.py:53 +msgid "Statistics functions" +msgstr "Funcions estadístiques" + +#: searx/answerers/statistics/answerer.py:54 +msgid "Compute {functions} of the arguments" +msgstr "Calcula {functions} dels arguments" + +#: searx/engines/__init__.py:194 searx/engines/flycheck___init__.py:201 +msgid "Engine time (sec)" +msgstr "Temps del motor (segons)" + +#: searx/engines/__init__.py:198 searx/engines/flycheck___init__.py:205 +msgid "Page loads (sec)" +msgstr "Càrrega de la pàgina (segons)" + +#: searx/engines/__init__.py:202 searx/engines/flycheck___init__.py:209 +#: searx/templates/oscar/results.html:95 +#: searx/templates/simple/results.html:20 +msgid "Number of results" +msgstr "Nombre de resultats" + +#: searx/engines/__init__.py:206 searx/engines/flycheck___init__.py:213 +msgid "Scores" +msgstr "Valoració" + +#: searx/engines/__init__.py:210 searx/engines/flycheck___init__.py:217 +msgid "Scores per result" +msgstr "Valoració segons el resultat" + +#: searx/engines/__init__.py:214 searx/engines/flycheck___init__.py:221 +msgid "Errors" +msgstr "Errors" + +#: searx/engines/pdbe.py:87 +msgid "{title} (OBSOLETE)" +msgstr "{title} (OBSOLET)" + +#: searx/engines/pdbe.py:91 +msgid "This entry has been superseded by" +msgstr "Aquesta entrada ha estat substituïda per" + +#: searx/engines/pubmed.py:74 +msgid "No abstract is available for this publication." +msgstr "No hi ha resum disponible per a aquesta publicació." + +#: searx/plugins/https_rewrite.py:32 +msgid "Rewrite HTTP links to HTTPS if possible" +msgstr "Reescriu els enllaços HTTP cap a HTTPS si és possible" + +#: searx/plugins/infinite_scroll.py:3 +msgid "Infinite scroll" +msgstr "Desplaçament infinit" + +#: searx/plugins/infinite_scroll.py:4 +msgid "Automatically load next page when scrolling to bottom of current page" +msgstr "Carrega automàticament la pàgina següent en desplaçar-se al final de la pàgina actual" + +#: searx/plugins/oa_doi_rewrite.py:9 +msgid "Open Access DOI rewrite" +msgstr "Reescriu l'Open Access DOI" + +#: searx/plugins/oa_doi_rewrite.py:10 +msgid "" +"Avoid paywalls by redirecting to open-access versions of publications when " +"available" +msgstr "Evita els llocs de pagaments redirigint a versions d'accés obert de les publicacions si és possible" + +#: searx/plugins/open_results_on_new_tab.py:18 +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/simple/preferences.html:149 +msgid "Open result links on new browser tabs" +msgstr "Obre els enllaços de resultats en una pestanya nova" + +#: searx/plugins/open_results_on_new_tab.py:19 +msgid "" +"Results are opened in the same window by default. This plugin overwrites the" +" default behaviour to open links on new tabs/windows. (JavaScript required)" +msgstr "De forma predeterminada, els resultats s'obren en la mateixa finestra. Aquest connector canvia el comportament predeterminat i obre els enllaços en una finestra o pestanya nova. (Cal JavaScript)" + +#: searx/plugins/search_on_category_select.py:18 +msgid "Search on category select" +msgstr "Cerca en la selecció de categories" + +#: searx/plugins/search_on_category_select.py:19 +msgid "" +"Perform search immediately if a category selected. Disable to select " +"multiple categories. (JavaScript required)" +msgstr "Executa la cerca immediatament si hi ha seleccionada una categoria. Desactiveu-ho per a seleccionar més d'una categoria. (Cal JavaScript)" + +#: searx/plugins/self_info.py:20 +msgid "" +"Displays your IP if the query is \"ip\" and your user agent if the query " +"contains \"user agent\"." +msgstr "Mostra la vostra IP si la consulta és «ip» i el valor «user agent» del navegador si la consulta conté «user agent»." + +#: searx/plugins/tracker_url_remover.py:26 +msgid "Tracker URL remover" +msgstr "Suprimeix l'URL de rastreig" + +#: searx/plugins/tracker_url_remover.py:27 +msgid "Remove trackers arguments from the returned URL" +msgstr "Suprimeix els arguments de rastreig de les URL retornades" + +#: searx/plugins/vim_hotkeys.py:3 +msgid "Vim-like hotkeys" +msgstr "Dreceres de teclat del Vim" + +#: searx/plugins/vim_hotkeys.py:4 +msgid "" +"Navigate search results with Vim-like hotkeys (JavaScript required). Press " +"\"h\" key on main or result page to get help." +msgstr "Navegació pels resultats de la cerca amb les dreceres a l'estil Vim (cal JavaScript). Pitgeu la tecla «h» en la pàgina principal o de resultats per a obtenir ajuda." + +#: searx/templates/courgette/404.html:4 searx/templates/legacy/404.html:4 +#: searx/templates/oscar/404.html:4 searx/templates/pix-art/404.html:4 +#: searx/templates/simple/404.html:4 +msgid "Page not found" +msgstr "No s'ha trobat la pàgina" + +#: searx/templates/courgette/404.html:6 searx/templates/legacy/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +#: searx/templates/simple/404.html:6 +#, python-format +msgid "Go to %(search_page)s." +msgstr "Vés a %(search_page)s." + +#: searx/templates/courgette/404.html:6 searx/templates/legacy/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +#: searx/templates/simple/404.html:6 +msgid "search page" +msgstr "pàgina de cerca" + +#: searx/templates/courgette/index.html:9 +#: searx/templates/courgette/index.html:13 +#: searx/templates/courgette/results.html:5 +#: searx/templates/legacy/index.html:8 searx/templates/legacy/index.html:12 +#: searx/templates/oscar/navbar.html:7 +#: searx/templates/oscar/preferences.html:3 +#: searx/templates/pix-art/index.html:8 +msgid "preferences" +msgstr "preferències" + +#: searx/templates/courgette/index.html:11 +#: searx/templates/legacy/index.html:10 searx/templates/oscar/about.html:2 +#: searx/templates/oscar/navbar.html:6 searx/templates/pix-art/index.html:7 +msgid "about" +msgstr "quant a" + +#: searx/templates/courgette/preferences.html:5 +#: searx/templates/legacy/preferences.html:5 +#: searx/templates/oscar/preferences.html:8 +#: searx/templates/pix-art/preferences.html:5 +#: searx/templates/simple/preferences.html:26 +msgid "Preferences" +msgstr "Preferències" + +#: searx/templates/courgette/preferences.html:9 +#: searx/templates/legacy/preferences.html:9 +#: searx/templates/oscar/preferences.html:33 +#: searx/templates/oscar/preferences.html:35 +#: searx/templates/simple/preferences.html:34 +msgid "Default categories" +msgstr "Categories predeterminades" + +#: searx/templates/courgette/preferences.html:13 +#: searx/templates/legacy/preferences.html:14 +#: searx/templates/oscar/preferences.html:41 +#: searx/templates/pix-art/preferences.html:9 +#: searx/templates/simple/preferences.html:39 +#: searx/templates/simple/preferences.html:163 +msgid "Search language" +msgstr "Llengua de cerca" + +#: searx/templates/courgette/preferences.html:16 +#: searx/templates/legacy/preferences.html:17 +#: searx/templates/oscar/languages.html:6 +#: searx/templates/pix-art/preferences.html:12 +#: searx/templates/simple/languages.html:2 +#: searx/templates/simple/preferences.html:42 +msgid "Default language" +msgstr "Llengua predeterminada" + +#: searx/templates/courgette/preferences.html:24 +#: searx/templates/legacy/preferences.html:25 +#: searx/templates/oscar/preferences.html:47 +#: searx/templates/pix-art/preferences.html:20 +#: searx/templates/simple/preferences.html:120 +msgid "Interface language" +msgstr "Llengua de la interfície" + +#: searx/templates/courgette/preferences.html:34 +#: searx/templates/legacy/preferences.html:35 +#: searx/templates/oscar/preferences.html:57 +#: searx/templates/simple/preferences.html:51 +msgid "Autocomplete" +msgstr "Compleció automàtica" + +#: searx/templates/courgette/preferences.html:45 +#: searx/templates/legacy/preferences.html:46 +#: searx/templates/oscar/preferences.html:68 +#: searx/templates/simple/preferences.html:166 +msgid "Image proxy" +msgstr "Servidor intermediari d'imatges" + +#: searx/templates/courgette/preferences.html:48 +#: searx/templates/legacy/preferences.html:49 +#: searx/templates/oscar/preferences.html:72 +#: searx/templates/simple/preferences.html:169 +msgid "Enabled" +msgstr "Activat" + +#: searx/templates/courgette/preferences.html:49 +#: searx/templates/legacy/preferences.html:50 +#: searx/templates/oscar/preferences.html:73 +#: searx/templates/simple/preferences.html:170 +msgid "Disabled" +msgstr "Desactivat" + +#: searx/templates/courgette/preferences.html:54 +#: searx/templates/legacy/preferences.html:55 +#: searx/templates/oscar/preferences.html:77 +#: searx/templates/pix-art/preferences.html:30 +#: searx/templates/simple/preferences.html:156 +msgid "Method" +msgstr "Mètode" + +#: searx/templates/courgette/preferences.html:63 +#: searx/templates/legacy/preferences.html:64 +#: searx/templates/oscar/preferences.html:86 +#: searx/templates/oscar/preferences.html:165 +#: searx/templates/oscar/preferences.html:173 +#: searx/templates/simple/preferences.html:63 +#: searx/templates/simple/preferences.html:90 +msgid "SafeSearch" +msgstr "Cerca segura" + +#: searx/templates/courgette/preferences.html:66 +#: searx/templates/legacy/preferences.html:67 +#: searx/templates/oscar/preferences.html:90 +#: searx/templates/simple/preferences.html:66 +msgid "Strict" +msgstr "Estricta" + +#: searx/templates/courgette/preferences.html:67 +#: searx/templates/legacy/preferences.html:68 +#: searx/templates/oscar/preferences.html:91 +#: searx/templates/simple/preferences.html:67 +msgid "Moderate" +msgstr "Moderada" + +#: searx/templates/courgette/preferences.html:68 +#: searx/templates/legacy/preferences.html:69 +#: searx/templates/oscar/preferences.html:92 +#: searx/templates/simple/preferences.html:68 +msgid "None" +msgstr "Cap" + +#: searx/templates/courgette/preferences.html:73 +#: searx/templates/legacy/preferences.html:74 +#: searx/templates/oscar/preferences.html:96 +#: searx/templates/pix-art/preferences.html:39 +#: searx/templates/simple/preferences.html:131 +msgid "Themes" +msgstr "Temes" + +#: searx/templates/courgette/preferences.html:83 +msgid "Color" +msgstr "Color" + +#: searx/templates/courgette/preferences.html:86 +msgid "Blue (default)" +msgstr "Blau (predeterminat)" + +#: searx/templates/courgette/preferences.html:87 +msgid "Violet" +msgstr "Violat" + +#: searx/templates/courgette/preferences.html:88 +msgid "Green" +msgstr "Verd" + +#: searx/templates/courgette/preferences.html:89 +msgid "Cyan" +msgstr "Cian" + +#: searx/templates/courgette/preferences.html:90 +msgid "Orange" +msgstr "Taronja" + +#: searx/templates/courgette/preferences.html:91 +msgid "Red" +msgstr "Vermell" + +#: searx/templates/courgette/preferences.html:96 +#: searx/templates/legacy/preferences.html:93 +#: searx/templates/pix-art/preferences.html:49 +#: searx/templates/simple/preferences.html:77 +msgid "Currently used search engines" +msgstr "Motors de cerca usats actualment" + +#: searx/templates/courgette/preferences.html:100 +#: searx/templates/legacy/preferences.html:97 +#: searx/templates/oscar/preferences.html:162 +#: searx/templates/oscar/preferences.html:176 +#: searx/templates/pix-art/preferences.html:53 +#: searx/templates/simple/preferences.html:87 +msgid "Engine name" +msgstr "Nom del motor" + +#: searx/templates/courgette/preferences.html:101 +#: searx/templates/legacy/preferences.html:98 +msgid "Category" +msgstr "Categoria" + +#: searx/templates/courgette/preferences.html:102 +#: searx/templates/courgette/preferences.html:113 +#: searx/templates/legacy/preferences.html:99 +#: searx/templates/legacy/preferences.html:110 +#: searx/templates/oscar/preferences.html:161 +#: searx/templates/oscar/preferences.html:177 +#: searx/templates/pix-art/preferences.html:54 +#: searx/templates/pix-art/preferences.html:64 +#: searx/templates/simple/preferences.html:86 +msgid "Allow" +msgstr "Permet" + +#: searx/templates/courgette/preferences.html:102 +#: searx/templates/courgette/preferences.html:114 +#: searx/templates/legacy/preferences.html:99 +#: searx/templates/legacy/preferences.html:111 +#: searx/templates/pix-art/preferences.html:54 +#: searx/templates/pix-art/preferences.html:65 +msgid "Block" +msgstr "Bloca" + +#: searx/templates/courgette/preferences.html:122 +#: searx/templates/legacy/preferences.html:119 +#: searx/templates/oscar/preferences.html:297 +#: searx/templates/pix-art/preferences.html:73 +#: searx/templates/simple/preferences.html:180 +msgid "" +"These settings are stored in your cookies, this allows us not to store this " +"data about you." +msgstr "Aquesta configuració es desa en les galetes. Això ens permet no emmagatzemar les vostres dades." + +#: searx/templates/courgette/preferences.html:124 +#: searx/templates/legacy/preferences.html:121 +#: searx/templates/oscar/preferences.html:299 +#: searx/templates/pix-art/preferences.html:75 +#: searx/templates/simple/preferences.html:182 +msgid "" +"These cookies serve your sole convenience, we don't use these cookies to " +"track you." +msgstr "Aquestes galetes només són per a la vostra conveniència. No les usem per a rastrejar-vos." + +#: searx/templates/courgette/preferences.html:127 +#: searx/templates/legacy/preferences.html:124 +#: searx/templates/oscar/preferences.html:305 +#: searx/templates/pix-art/preferences.html:78 +#: searx/templates/simple/preferences.html:185 +msgid "save" +msgstr "desa" + +#: searx/templates/courgette/preferences.html:128 +#: searx/templates/legacy/preferences.html:125 +#: searx/templates/oscar/preferences.html:307 +#: searx/templates/simple/preferences.html:186 +msgid "Reset defaults" +msgstr "Restaura els valors predeterminats" + +#: searx/templates/courgette/preferences.html:129 +#: searx/templates/legacy/preferences.html:126 +#: searx/templates/oscar/preferences.html:306 +#: searx/templates/pix-art/preferences.html:79 +#: searx/templates/simple/preferences.html:187 +msgid "back" +msgstr "enrere" + +#: searx/templates/courgette/results.html:12 +#: searx/templates/legacy/results.html:13 +#: searx/templates/oscar/results.html:136 +#: searx/templates/simple/results.html:58 +msgid "Search URL" +msgstr "URL de cerca" + +#: searx/templates/courgette/results.html:16 +#: searx/templates/legacy/results.html:17 +#: searx/templates/oscar/results.html:141 +#: searx/templates/simple/results.html:62 +msgid "Download results" +msgstr "Baixa els resultats" + +#: searx/templates/courgette/results.html:34 +#: searx/templates/legacy/results.html:35 +#: searx/templates/simple/results.html:10 +msgid "Answers" +msgstr "Respostes" + +#: searx/templates/courgette/results.html:42 +#: searx/templates/legacy/results.html:43 +#: searx/templates/oscar/results.html:116 +#: searx/templates/simple/results.html:42 +msgid "Suggestions" +msgstr "Suggeriments" + +#: searx/templates/courgette/results.html:70 +#: searx/templates/legacy/results.html:81 +#: searx/templates/oscar/results.html:68 searx/templates/oscar/results.html:78 +#: searx/templates/simple/results.html:130 +msgid "previous page" +msgstr "pàgina anterior" + +#: searx/templates/courgette/results.html:81 +#: searx/templates/legacy/results.html:92 +#: searx/templates/oscar/results.html:62 searx/templates/oscar/results.html:84 +#: searx/templates/simple/results.html:145 +msgid "next page" +msgstr "pàgina següent" + +#: searx/templates/courgette/search.html:3 +#: searx/templates/legacy/search.html:3 searx/templates/oscar/search.html:6 +#: searx/templates/oscar/search_full.html:9 +#: searx/templates/pix-art/search.html:3 searx/templates/simple/search.html:4 +msgid "Search for..." +msgstr "Cerca..." + +#: searx/templates/courgette/stats.html:4 searx/templates/legacy/stats.html:4 +#: searx/templates/oscar/stats.html:5 searx/templates/pix-art/stats.html:4 +#: searx/templates/simple/stats.html:7 +msgid "Engine stats" +msgstr "Estadístiques del motor" + +#: searx/templates/courgette/result_templates/images.html:4 +#: searx/templates/legacy/result_templates/images.html:4 +#: searx/templates/pix-art/result_templates/images.html:4 +msgid "original context" +msgstr "context original" + +#: searx/templates/courgette/result_templates/torrent.html:7 +#: searx/templates/legacy/result_templates/torrent.html:11 +#: searx/templates/oscar/result_templates/torrent.html:6 +#: searx/templates/simple/result_templates/torrent.html:9 +msgid "Seeder" +msgstr "Font" + +#: searx/templates/courgette/result_templates/torrent.html:7 +#: searx/templates/legacy/result_templates/torrent.html:11 +#: searx/templates/oscar/result_templates/torrent.html:6 +#: searx/templates/simple/result_templates/torrent.html:9 +msgid "Leecher" +msgstr "Descarregador" + +#: searx/templates/courgette/result_templates/torrent.html:9 +#: searx/templates/legacy/result_templates/torrent.html:9 +#: searx/templates/oscar/macros.html:23 +#: searx/templates/simple/result_templates/torrent.html:6 +msgid "magnet link" +msgstr "enllaç magnet" + +#: searx/templates/courgette/result_templates/torrent.html:10 +#: searx/templates/legacy/result_templates/torrent.html:10 +#: searx/templates/oscar/macros.html:24 +#: searx/templates/simple/result_templates/torrent.html:7 +msgid "torrent file" +msgstr "fitxer torrent" + +#: searx/templates/legacy/categories.html:8 +#: searx/templates/simple/categories.html:6 +msgid "Click on the magnifier to perform search" +msgstr "Feu clic en la lupa per a executar la cerca" + +#: searx/templates/legacy/preferences.html:84 +#: searx/templates/oscar/preferences.html:113 +#: searx/templates/simple/preferences.html:142 +msgid "Results on new tabs" +msgstr "Resultats en pestanyes noves" + +#: searx/templates/legacy/preferences.html:87 +#: searx/templates/oscar/preferences.html:117 +#: searx/templates/simple/preferences.html:145 +msgid "On" +msgstr "Activat" + +#: searx/templates/legacy/preferences.html:88 +#: searx/templates/oscar/preferences.html:118 +#: searx/templates/simple/preferences.html:146 +msgid "Off" +msgstr "Desactivat" + +#: searx/templates/legacy/result_templates/code.html:3 +#: searx/templates/legacy/result_templates/default.html:3 +#: searx/templates/legacy/result_templates/map.html:9 +#: searx/templates/oscar/macros.html:34 searx/templates/oscar/macros.html:48 +#: searx/templates/simple/macros.html:43 +msgid "cached" +msgstr "en memòria cau" + +#: searx/templates/oscar/advanced.html:4 +msgid "Advanced settings" +msgstr "Configuració avançada" + +#: searx/templates/oscar/base.html:62 +#: searx/templates/oscar/messages/first_time.html:4 +#: searx/templates/oscar/messages/save_settings_successfull.html:5 +#: searx/templates/oscar/messages/unknow_error.html:5 +msgid "Close" +msgstr "Tanca" + +#: searx/templates/oscar/base.html:64 +#: searx/templates/oscar/messages/no_results.html:4 +#: searx/templates/simple/messages/no_results.html:4 +#: searx/templates/simple/results.html:25 +msgid "Error!" +msgstr "Error!" + +#: searx/templates/oscar/base.html:90 searx/templates/simple/base.html:55 +msgid "Powered by" +msgstr "Funciona amb" + +#: searx/templates/oscar/base.html:90 searx/templates/simple/base.html:55 +msgid "a privacy-respecting, hackable metasearch engine" +msgstr "un meta motor de cerca personalitzable i respectuós amb la privadesa" + +#: searx/templates/oscar/macros.html:36 searx/templates/oscar/macros.html:50 +#: searx/templates/simple/macros.html:43 +msgid "proxied" +msgstr "en servidor intermediari" + +#: searx/templates/oscar/macros.html:92 +msgid "supported" +msgstr "suportat" + +#: searx/templates/oscar/macros.html:96 +msgid "not supported" +msgstr "no suportat" + +#: searx/templates/oscar/preferences.html:13 +#: searx/templates/oscar/preferences.html:22 +#: searx/templates/simple/preferences.html:32 +msgid "General" +msgstr "General" + +#: searx/templates/oscar/preferences.html:14 +#: searx/templates/oscar/preferences.html:146 +#: searx/templates/simple/preferences.html:76 +msgid "Engines" +msgstr "Motorrs" + +#: searx/templates/oscar/preferences.html:15 +#: searx/templates/oscar/preferences.html:219 +msgid "Plugins" +msgstr "Connectat" + +#: searx/templates/oscar/preferences.html:16 +#: searx/templates/oscar/preferences.html:245 +msgid "Answerers" +msgstr "Resposter" + +#: searx/templates/oscar/preferences.html:17 +#: searx/templates/oscar/preferences.html:272 +msgid "Cookies" +msgstr "Galetes" + +#: searx/templates/oscar/preferences.html:42 +#: searx/templates/simple/preferences.html:48 +msgid "What language do you prefer for search?" +msgstr "En quina llengua preferiu cercar?" + +#: searx/templates/oscar/preferences.html:48 +#: searx/templates/simple/preferences.html:128 +msgid "Change the language of the layout" +msgstr "Canvia la llengua de la disposició" + +#: searx/templates/oscar/preferences.html:58 +#: searx/templates/simple/preferences.html:60 +msgid "Find stuff as you type" +msgstr "Troba coses tal com escriu" + +#: searx/templates/oscar/preferences.html:69 +#: searx/templates/simple/preferences.html:173 +msgid "Proxying image results through searx" +msgstr "Envia els resultats d'imatges via el servidor intermediari del searx" + +#: searx/templates/oscar/preferences.html:78 +msgid "" +"Change how forms are submited, <a " +"href=\"http://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods\"" +" rel=\"external\">learn more about request methods</a>" +msgstr "Canvia com es trameten els formularis, <a href=\"http://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods\" rel=\"external\">més informació sobre els mètodes de petició</a>" + +#: searx/templates/oscar/preferences.html:87 +#: searx/templates/simple/preferences.html:71 +msgid "Filter content" +msgstr "Filtra el contingut" + +#: searx/templates/oscar/preferences.html:97 +#: searx/templates/simple/preferences.html:139 +msgid "Change searx layout" +msgstr "Canvia la disposició del searx" + +#: searx/templates/oscar/preferences.html:106 +#: searx/templates/oscar/preferences.html:111 +msgid "Choose style for this theme" +msgstr "Trieu un estil per a aquest tema" + +#: searx/templates/oscar/preferences.html:106 +#: searx/templates/oscar/preferences.html:111 +msgid "Style" +msgstr "Estil" + +#: searx/templates/oscar/preferences.html:122 +msgid "Open Access DOI resolver" +msgstr "Solucionador de l'Open Access DOI" + +#: searx/templates/oscar/preferences.html:123 +msgid "" +"Redirect to open-access versions of publications when available (plugin " +"required)" +msgstr "Redirigeix cap a versions d'accés obert de les publicacions si són disponibles (cal un connector)" + +#: searx/templates/oscar/preferences.html:163 +#: searx/templates/oscar/preferences.html:175 +#: searx/templates/simple/preferences.html:88 +msgid "Shortcut" +msgstr "Drecera" + +#: searx/templates/oscar/preferences.html:164 +#: searx/templates/oscar/preferences.html:174 +msgid "Selected language" +msgstr "Llengua seleccionada" + +#: searx/templates/oscar/preferences.html:166 +#: searx/templates/oscar/preferences.html:172 +#: searx/templates/simple/preferences.html:91 +msgid "Time range" +msgstr "Interval de temps" + +#: searx/templates/oscar/preferences.html:167 +#: searx/templates/oscar/preferences.html:171 +#: searx/templates/simple/preferences.html:92 +msgid "Avg. time" +msgstr "Temps amitjanat" + +#: searx/templates/oscar/preferences.html:168 +#: searx/templates/oscar/preferences.html:170 +#: searx/templates/simple/preferences.html:93 +msgid "Max time" +msgstr "Temps màxim" + +#: searx/templates/oscar/preferences.html:248 +msgid "This is the list of searx's instant answering modules." +msgstr "Aquest és el llistat dels mòduls de resposta ràpida del searx." + +#: searx/templates/oscar/preferences.html:252 +msgid "Name" +msgstr "Nom" + +#: searx/templates/oscar/preferences.html:253 +msgid "Keywords" +msgstr "Paraules clau" + +#: searx/templates/oscar/preferences.html:254 +msgid "Description" +msgstr "Descripció" + +#: searx/templates/oscar/preferences.html:255 +msgid "Examples" +msgstr "Exemples" + +#: searx/templates/oscar/preferences.html:275 +msgid "" +"This is the list of cookies and their values searx is storing on your " +"computer." +msgstr "Aquest és el llistat de les galetes, i els seu valor, que el searx té desats en el vostre equip." + +#: searx/templates/oscar/preferences.html:276 +msgid "With that list, you can assess searx transparency." +msgstr "Amb aquest llistat, podeu avaluar la transparència del searx." + +#: searx/templates/oscar/preferences.html:281 +msgid "Cookie name" +msgstr "Nom de la galeta" + +#: searx/templates/oscar/preferences.html:282 +msgid "Value" +msgstr "Valor" + +#: searx/templates/oscar/preferences.html:301 +msgid "Search URL of the currently saved preferences" +msgstr "URL de cerca de les preferències desades actualment" + +#: searx/templates/oscar/preferences.html:301 +msgid "" +"Note: specifying custom settings in the search URL can reduce privacy by " +"leaking data to the clicked result sites." +msgstr "Nota: si indiqueu configuracions personalitzades en la URL de cerca podeu reduir la privadesa, amb filtració de dades, en fer clic als llocs dels resultats." + +#: searx/templates/oscar/results.html:17 +msgid "Search results" +msgstr "Resultats de la cerca" + +#: searx/templates/oscar/results.html:21 +#: searx/templates/simple/results.html:84 +msgid "Try searching for:" +msgstr "Proveu a cercar:" + +#: searx/templates/oscar/results.html:100 +#: searx/templates/simple/results.html:25 +msgid "Engines cannot retrieve results" +msgstr "Els motors no poden obtenir cap resultat" + +#: searx/templates/oscar/results.html:131 +msgid "Links" +msgstr "Enllaços" + +#: searx/templates/oscar/search.html:8 +#: searx/templates/oscar/search_full.html:11 +#: searx/templates/simple/search.html:5 +msgid "Start search" +msgstr "Comença la cerca" + +#: searx/templates/oscar/stats.html:2 +msgid "stats" +msgstr "estadístiques" + +#: searx/templates/oscar/time-range.html:3 +#: searx/templates/simple/time-range.html:3 +msgid "Anytime" +msgstr "En qualsevol moment" + +#: searx/templates/oscar/time-range.html:6 +#: searx/templates/simple/time-range.html:6 +msgid "Last day" +msgstr "Les darreres 24 hores" + +#: searx/templates/oscar/time-range.html:9 +#: searx/templates/simple/time-range.html:9 +msgid "Last week" +msgstr "La setmana passada" + +#: searx/templates/oscar/time-range.html:12 +#: searx/templates/simple/time-range.html:12 +msgid "Last month" +msgstr "El darrer mes" + +#: searx/templates/oscar/time-range.html:15 +#: searx/templates/simple/time-range.html:15 +msgid "Last year" +msgstr "El darrer any" + +#: searx/templates/oscar/messages/first_time.html:6 +#: searx/templates/oscar/messages/no_data_available.html:3 +msgid "Heads up!" +msgstr "Atenció!" + +#: searx/templates/oscar/messages/first_time.html:7 +msgid "It look like you are using searx first time." +msgstr "Sembla que esteu usant searx per primer cop." + +#: searx/templates/oscar/messages/no_cookies.html:3 +msgid "Information!" +msgstr "Informació!" + +#: searx/templates/oscar/messages/no_cookies.html:4 +msgid "currently, there are no cookies defined." +msgstr "actualment, no hi ha definida cap galeta." + +#: searx/templates/oscar/messages/no_data_available.html:4 +msgid "There is currently no data available. " +msgstr "Actualment, no hi ha dades disponibles." + +#: searx/templates/oscar/messages/no_results.html:4 +#: searx/templates/simple/messages/no_results.html:4 +msgid "Engines cannot retrieve results." +msgstr "Els motors no poden obtenir cap resultat" + +#: searx/templates/oscar/messages/no_results.html:10 +#: searx/templates/simple/messages/no_results.html:10 +msgid "Please, try again later or find another searx instance." +msgstr "Torneu-ho a intentar més tard o useu una altra instància del searx." + +#: searx/templates/oscar/messages/no_results.html:14 +#: searx/templates/simple/messages/no_results.html:14 +msgid "Sorry!" +msgstr "Disculpeu!" + +#: searx/templates/oscar/messages/no_results.html:15 +#: searx/templates/simple/messages/no_results.html:15 +msgid "" +"we didn't find any results. Please use another query or search in more " +"categories." +msgstr "no hem trobat cap resultat. Feu una consulta diferent o cerqueu en més categories." + +#: searx/templates/oscar/messages/save_settings_successfull.html:7 +msgid "Well done!" +msgstr "Ben fet!" + +#: searx/templates/oscar/messages/save_settings_successfull.html:8 +msgid "Settings saved successfully." +msgstr "La configuració s'ha desat correctament." + +#: searx/templates/oscar/messages/unknow_error.html:7 +msgid "Oh snap!" +msgstr "Cagundena!" + +#: searx/templates/oscar/messages/unknow_error.html:8 +msgid "Something went wrong." +msgstr "Alguna cosa ha anat malament." + +#: searx/templates/oscar/result_templates/default.html:7 +#: searx/templates/simple/result_templates/default.html:6 +msgid "show media" +msgstr "mostra el contingut multimèdia" + +#: searx/templates/oscar/result_templates/default.html:7 +#: searx/templates/simple/result_templates/default.html:6 +msgid "hide media" +msgstr "amaga el contingut multimèdia" + +#: searx/templates/oscar/result_templates/images.html:30 +msgid "Get image" +msgstr "Obtén la imatge" + +#: searx/templates/oscar/result_templates/images.html:33 +msgid "View source" +msgstr "Mostra el codi font" + +#: searx/templates/oscar/result_templates/map.html:7 +#: searx/templates/simple/result_templates/map.html:7 +msgid "show map" +msgstr "mostra el mapa" + +#: searx/templates/oscar/result_templates/map.html:7 +#: searx/templates/simple/result_templates/map.html:7 +msgid "hide map" +msgstr "amaga el mapa" + +#: searx/templates/oscar/result_templates/map.html:11 +#: searx/templates/simple/result_templates/map.html:11 +msgid "show details" +msgstr "mostra els detalls" + +#: searx/templates/oscar/result_templates/map.html:11 +#: searx/templates/simple/result_templates/map.html:11 +msgid "hide details" +msgstr "amaga els detalls" + +#: searx/templates/oscar/result_templates/torrent.html:7 +#: searx/templates/simple/result_templates/torrent.html:11 +msgid "Filesize" +msgstr "Mida del fitxer" + +#: searx/templates/oscar/result_templates/torrent.html:9 +#: searx/templates/simple/result_templates/torrent.html:12 +msgid "Bytes" +msgstr "Bytes" + +#: searx/templates/oscar/result_templates/torrent.html:10 +#: searx/templates/simple/result_templates/torrent.html:13 +msgid "kiB" +msgstr "kiB" + +#: searx/templates/oscar/result_templates/torrent.html:11 +#: searx/templates/simple/result_templates/torrent.html:14 +msgid "MiB" +msgstr "MiB" + +#: searx/templates/oscar/result_templates/torrent.html:12 +#: searx/templates/simple/result_templates/torrent.html:15 +msgid "GiB" +msgstr "GiB" + +#: searx/templates/oscar/result_templates/torrent.html:13 +#: searx/templates/simple/result_templates/torrent.html:16 +msgid "TiB" +msgstr "TiB" + +#: searx/templates/oscar/result_templates/torrent.html:15 +#: searx/templates/simple/result_templates/torrent.html:20 +msgid "Number of Files" +msgstr "Nombre de fiters" + +#: searx/templates/oscar/result_templates/videos.html:7 +#: searx/templates/simple/result_templates/videos.html:6 +msgid "show video" +msgstr "mostra el vídeo" + +#: searx/templates/oscar/result_templates/videos.html:7 +#: searx/templates/simple/result_templates/videos.html:6 +msgid "hide video" +msgstr "amaga el vídeo" + +#: searx/templates/pix-art/results.html:28 +msgid "Load more..." +msgstr "Carrega'n més..." + +#: searx/templates/simple/base.html:31 +msgid "No item found" +msgstr "No s'ha trobat cap element" + +#: searx/templates/simple/preferences.html:89 +msgid "Supports selected language" +msgstr "Suporta la llengua seleccionada" + +#: searx/templates/simple/preferences.html:118 +msgid "User interface" +msgstr "Interfície d'usuari" + +#: searx/templates/simple/preferences.html:154 +msgid "Privacy" +msgstr "Privadesa" diff --git a/searx/translations/cs/LC_MESSAGES/messages.mo b/searx/translations/cs/LC_MESSAGES/messages.mo index 3e638afa32..eded7150ad 100644 Binary files a/searx/translations/cs/LC_MESSAGES/messages.mo and b/searx/translations/cs/LC_MESSAGES/messages.mo differ diff --git a/searx/translations/cs/LC_MESSAGES/messages.po b/searx/translations/cs/LC_MESSAGES/messages.po index ef96271fc0..8d3ce3c3e9 100644 --- a/searx/translations/cs/LC_MESSAGES/messages.po +++ b/searx/translations/cs/LC_MESSAGES/messages.po @@ -4,24 +4,25 @@ # # Translators: # Clon <fillip1@seznam.cz>, 2017 +# Václav Zouzalík <Vaclav.Zouzalik@seznam.cz>, 2018 msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" "POT-Creation-Date: 2017-11-01 21:31+0100\n" -"PO-Revision-Date: 2017-11-01 20:31+0000\n" -"Last-Translator: Adam Tauber <asciimoo@gmail.com>\n" +"PO-Revision-Date: 2018-12-18 12:03+0000\n" +"Last-Translator: Václav Zouzalík <Vaclav.Zouzalik@seznam.cz>\n" "Language-Team: Czech (http://www.transifex.com/asciimoo/searx/language/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 2.3.4\n" "Language: cs\n" -"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n" #: searx/search.py:137 searx/search.py:182 msgid "timeout" -msgstr "" +msgstr "timeout" #: searx/search.py:144 msgid "request exception" @@ -77,7 +78,7 @@ msgstr "Neplatné nastavení, upravte svoje předvolby" #: searx/webapp.py:415 msgid "Invalid settings" -msgstr "" +msgstr "Neplatné nastavení" #: searx/webapp.py:449 searx/webapp.py:493 msgid "search error" @@ -131,7 +132,7 @@ msgstr "" #: searx/engines/__init__.py:214 searx/engines/flycheck___init__.py:221 msgid "Errors" -msgstr "Chyb" +msgstr "Chyby" #: searx/engines/pdbe.py:87 msgid "{title} (OBSOLETE)" @@ -187,13 +188,13 @@ msgstr "Hledat ve vybrané kategorii" msgid "" "Perform search immediately if a category selected. Disable to select " "multiple categories. (JavaScript required)" -msgstr "" +msgstr "Vyhledávejte okamžitě, pokud je vybrána kategorie. Vypněte, pokud potřebujete zvolit vícero kategorií. (vyžaduje JavaScript)" #: searx/plugins/self_info.py:20 msgid "" "Displays your IP if the query is \"ip\" and your user agent if the query " "contains \"user agent\"." -msgstr "" +msgstr "Ukáže vaši IP adresu, pokud dotaz je \"ip\", a váš user agent, pokud dotatz obsahuje \"user agent\"." #: searx/plugins/tracker_url_remover.py:26 msgid "Tracker URL remover" @@ -375,7 +376,7 @@ msgstr "Modrá (základní)" #: searx/templates/courgette/preferences.html:87 msgid "Violet" -msgstr "" +msgstr "Fialová" #: searx/templates/courgette/preferences.html:88 msgid "Green" @@ -383,7 +384,7 @@ msgstr "Zelená" #: searx/templates/courgette/preferences.html:89 msgid "Cyan" -msgstr "" +msgstr "Modrozelená" #: searx/templates/courgette/preferences.html:90 msgid "Orange" @@ -543,14 +544,14 @@ msgstr "původní kontext" #: searx/templates/oscar/result_templates/torrent.html:6 #: searx/templates/simple/result_templates/torrent.html:9 msgid "Seeder" -msgstr "" +msgstr "Seeder" #: searx/templates/courgette/result_templates/torrent.html:7 #: searx/templates/legacy/result_templates/torrent.html:11 #: searx/templates/oscar/result_templates/torrent.html:6 #: searx/templates/simple/result_templates/torrent.html:9 msgid "Leecher" -msgstr "" +msgstr "Leecher" #: searx/templates/courgette/result_templates/torrent.html:9 #: searx/templates/legacy/result_templates/torrent.html:9 @@ -676,7 +677,7 @@ msgstr "Změnít jazyk prostředí" #: searx/templates/oscar/preferences.html:58 #: searx/templates/simple/preferences.html:60 msgid "Find stuff as you type" -msgstr "" +msgstr "Vyhledávat během psaní" #: searx/templates/oscar/preferences.html:69 #: searx/templates/simple/preferences.html:173 @@ -729,7 +730,7 @@ msgstr "Zkratka" #: searx/templates/oscar/preferences.html:164 #: searx/templates/oscar/preferences.html:174 msgid "Selected language" -msgstr "" +msgstr "Zvolený jazyk" #: searx/templates/oscar/preferences.html:166 #: searx/templates/oscar/preferences.html:172 @@ -853,7 +854,7 @@ msgstr "Rok" #: searx/templates/oscar/messages/first_time.html:6 #: searx/templates/oscar/messages/no_data_available.html:3 msgid "Heads up!" -msgstr "Hlavy vzhůru!" +msgstr "Hlavu vzhůru!" #: searx/templates/oscar/messages/first_time.html:7 msgid "It look like you are using searx first time." @@ -879,7 +880,7 @@ msgstr "" #: searx/templates/oscar/messages/no_results.html:10 #: searx/templates/simple/messages/no_results.html:10 msgid "Please, try again later or find another searx instance." -msgstr "" +msgstr "Zkuste prosím později, nebo na jiné instanci searxu." #: searx/templates/oscar/messages/no_results.html:14 #: searx/templates/simple/messages/no_results.html:14 @@ -891,7 +892,7 @@ msgstr "Pardón!" msgid "" "we didn't find any results. Please use another query or search in more " "categories." -msgstr "nenašly jsme žádné výsledky. Prosím použíjte jiný dotaz nebo hledejte ve více kategoriích." +msgstr "Nenašli jsme žádné výsledky. Použijte prosím jiný dotaz nebo hledejte ve více kategoriích." #: searx/templates/oscar/messages/save_settings_successfull.html:7 msgid "Well done!" @@ -1010,4 +1011,4 @@ msgstr "" #: searx/templates/simple/preferences.html:154 msgid "Privacy" -msgstr "" +msgstr "Soukromí" diff --git a/searx/translations/cy/LC_MESSAGES/messages.mo b/searx/translations/cy/LC_MESSAGES/messages.mo new file mode 100644 index 0000000000..066d268e03 Binary files /dev/null and b/searx/translations/cy/LC_MESSAGES/messages.mo differ diff --git a/searx/translations/cy/LC_MESSAGES/messages.po b/searx/translations/cy/LC_MESSAGES/messages.po new file mode 100644 index 0000000000..3344c6d1d5 --- /dev/null +++ b/searx/translations/cy/LC_MESSAGES/messages.po @@ -0,0 +1,1013 @@ +# Translations template for PROJECT. +# Copyright (C) 2017 ORGANIZATION +# This file is distributed under the same license as the PROJECT project. +# +# Translators: +# Aled Powell <aled@aledpowell.cymru>, 2019 +msgid "" +msgstr "" +"Project-Id-Version: searx\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2017-11-01 21:31+0100\n" +"PO-Revision-Date: 2019-01-05 13:50+0000\n" +"Last-Translator: Aled Powell <aled@aledpowell.cymru>\n" +"Language-Team: Welsh (http://www.transifex.com/asciimoo/searx/language/cy/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 2.3.4\n" +"Language: cy\n" +"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n" + +#: searx/search.py:137 searx/search.py:182 +msgid "timeout" +msgstr "" + +#: searx/search.py:144 +msgid "request exception" +msgstr "" + +#: searx/search.py:151 +msgid "unexpected crash" +msgstr "" + +#: searx/webapp.py:136 +msgid "files" +msgstr "ffeiliau" + +#: searx/webapp.py:137 +msgid "general" +msgstr "cyffredinol" + +#: searx/webapp.py:138 +msgid "music" +msgstr "cerddoriaeth" + +#: searx/webapp.py:139 +msgid "social media" +msgstr "cyfryngau cymdeithasol" + +#: searx/webapp.py:140 +msgid "images" +msgstr "delweddau" + +#: searx/webapp.py:141 +msgid "videos" +msgstr "fideos" + +#: searx/webapp.py:142 +msgid "it" +msgstr "Technoleg" + +#: searx/webapp.py:143 +msgid "news" +msgstr "newyddion" + +#: searx/webapp.py:144 +msgid "map" +msgstr "map" + +#: searx/webapp.py:145 +msgid "science" +msgstr "gwyddoniaeth" + +#: searx/webapp.py:399 searx/webapp.py:658 +msgid "Invalid settings, please edit your preferences" +msgstr "Gosodiadau annilys. Addasa dy ddewisiadau." + +#: searx/webapp.py:415 +msgid "Invalid settings" +msgstr "Gosodiadau annilys" + +#: searx/webapp.py:449 searx/webapp.py:493 +msgid "search error" +msgstr "gwall chwilio" + +#: searx/webapp.py:530 +msgid "{minutes} minute(s) ago" +msgstr "{minutes} munud yn ôl" + +#: searx/webapp.py:532 +msgid "{hours} hour(s), {minutes} minute(s) ago" +msgstr "{hours} awr, {minutes} munud yn ôl" + +#: searx/answerers/random/answerer.py:53 +msgid "Random value generator" +msgstr "" + +#: searx/answerers/random/answerer.py:54 +msgid "Generate different random values" +msgstr "" + +#: searx/answerers/statistics/answerer.py:53 +msgid "Statistics functions" +msgstr "" + +#: searx/answerers/statistics/answerer.py:54 +msgid "Compute {functions} of the arguments" +msgstr "" + +#: searx/engines/__init__.py:194 searx/engines/flycheck___init__.py:201 +msgid "Engine time (sec)" +msgstr "" + +#: searx/engines/__init__.py:198 searx/engines/flycheck___init__.py:205 +msgid "Page loads (sec)" +msgstr "" + +#: searx/engines/__init__.py:202 searx/engines/flycheck___init__.py:209 +#: searx/templates/oscar/results.html:95 +#: searx/templates/simple/results.html:20 +msgid "Number of results" +msgstr "Nifer o ganlyniadau" + +#: searx/engines/__init__.py:206 searx/engines/flycheck___init__.py:213 +msgid "Scores" +msgstr "Sgoriau" + +#: searx/engines/__init__.py:210 searx/engines/flycheck___init__.py:217 +msgid "Scores per result" +msgstr "" + +#: searx/engines/__init__.py:214 searx/engines/flycheck___init__.py:221 +msgid "Errors" +msgstr "Gwallau" + +#: searx/engines/pdbe.py:87 +msgid "{title} (OBSOLETE)" +msgstr "" + +#: searx/engines/pdbe.py:91 +msgid "This entry has been superseded by" +msgstr "" + +#: searx/engines/pubmed.py:74 +msgid "No abstract is available for this publication." +msgstr "" + +#: searx/plugins/https_rewrite.py:32 +msgid "Rewrite HTTP links to HTTPS if possible" +msgstr "" + +#: searx/plugins/infinite_scroll.py:3 +msgid "Infinite scroll" +msgstr "" + +#: searx/plugins/infinite_scroll.py:4 +msgid "Automatically load next page when scrolling to bottom of current page" +msgstr "" + +#: searx/plugins/oa_doi_rewrite.py:9 +msgid "Open Access DOI rewrite" +msgstr "" + +#: searx/plugins/oa_doi_rewrite.py:10 +msgid "" +"Avoid paywalls by redirecting to open-access versions of publications when " +"available" +msgstr "" + +#: searx/plugins/open_results_on_new_tab.py:18 +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/simple/preferences.html:149 +msgid "Open result links on new browser tabs" +msgstr "Agor dolenni canlyniadau mewn tabiau newydd yn y porwr" + +#: searx/plugins/open_results_on_new_tab.py:19 +msgid "" +"Results are opened in the same window by default. This plugin overwrites the" +" default behaviour to open links on new tabs/windows. (JavaScript required)" +msgstr "Mae canlyniadau fel arfer yn cael eu hagor yn yr un ffenestr. Mae'r ategolyn hwn yn newid hyn fel bod dolenni yn cael eu hagor mewn tabiau/ffenestri newydd. (Angen JavaScript)" + +#: searx/plugins/search_on_category_select.py:18 +msgid "Search on category select" +msgstr "" + +#: searx/plugins/search_on_category_select.py:19 +msgid "" +"Perform search immediately if a category selected. Disable to select " +"multiple categories. (JavaScript required)" +msgstr "" + +#: searx/plugins/self_info.py:20 +msgid "" +"Displays your IP if the query is \"ip\" and your user agent if the query " +"contains \"user agent\"." +msgstr "" + +#: searx/plugins/tracker_url_remover.py:26 +msgid "Tracker URL remover" +msgstr "" + +#: searx/plugins/tracker_url_remover.py:27 +msgid "Remove trackers arguments from the returned URL" +msgstr "" + +#: searx/plugins/vim_hotkeys.py:3 +msgid "Vim-like hotkeys" +msgstr "" + +#: searx/plugins/vim_hotkeys.py:4 +msgid "" +"Navigate search results with Vim-like hotkeys (JavaScript required). Press " +"\"h\" key on main or result page to get help." +msgstr "" + +#: searx/templates/courgette/404.html:4 searx/templates/legacy/404.html:4 +#: searx/templates/oscar/404.html:4 searx/templates/pix-art/404.html:4 +#: searx/templates/simple/404.html:4 +msgid "Page not found" +msgstr "" + +#: searx/templates/courgette/404.html:6 searx/templates/legacy/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +#: searx/templates/simple/404.html:6 +#, python-format +msgid "Go to %(search_page)s." +msgstr "Mynd i %(search_page)s." + +#: searx/templates/courgette/404.html:6 searx/templates/legacy/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +#: searx/templates/simple/404.html:6 +msgid "search page" +msgstr "tudalen chwilio" + +#: searx/templates/courgette/index.html:9 +#: searx/templates/courgette/index.html:13 +#: searx/templates/courgette/results.html:5 +#: searx/templates/legacy/index.html:8 searx/templates/legacy/index.html:12 +#: searx/templates/oscar/navbar.html:7 +#: searx/templates/oscar/preferences.html:3 +#: searx/templates/pix-art/index.html:8 +msgid "preferences" +msgstr "dewisiadau" + +#: searx/templates/courgette/index.html:11 +#: searx/templates/legacy/index.html:10 searx/templates/oscar/about.html:2 +#: searx/templates/oscar/navbar.html:6 searx/templates/pix-art/index.html:7 +msgid "about" +msgstr "ynghylch" + +#: searx/templates/courgette/preferences.html:5 +#: searx/templates/legacy/preferences.html:5 +#: searx/templates/oscar/preferences.html:8 +#: searx/templates/pix-art/preferences.html:5 +#: searx/templates/simple/preferences.html:26 +msgid "Preferences" +msgstr "Dewisiadau" + +#: searx/templates/courgette/preferences.html:9 +#: searx/templates/legacy/preferences.html:9 +#: searx/templates/oscar/preferences.html:33 +#: searx/templates/oscar/preferences.html:35 +#: searx/templates/simple/preferences.html:34 +msgid "Default categories" +msgstr "Categorïau arferol" + +#: searx/templates/courgette/preferences.html:13 +#: searx/templates/legacy/preferences.html:14 +#: searx/templates/oscar/preferences.html:41 +#: searx/templates/pix-art/preferences.html:9 +#: searx/templates/simple/preferences.html:39 +#: searx/templates/simple/preferences.html:163 +msgid "Search language" +msgstr "Iaith chwilio" + +#: searx/templates/courgette/preferences.html:16 +#: searx/templates/legacy/preferences.html:17 +#: searx/templates/oscar/languages.html:6 +#: searx/templates/pix-art/preferences.html:12 +#: searx/templates/simple/languages.html:2 +#: searx/templates/simple/preferences.html:42 +msgid "Default language" +msgstr "Iaith arferol" + +#: searx/templates/courgette/preferences.html:24 +#: searx/templates/legacy/preferences.html:25 +#: searx/templates/oscar/preferences.html:47 +#: searx/templates/pix-art/preferences.html:20 +#: searx/templates/simple/preferences.html:120 +msgid "Interface language" +msgstr "Iaith y rhyngwyneb" + +#: searx/templates/courgette/preferences.html:34 +#: searx/templates/legacy/preferences.html:35 +#: searx/templates/oscar/preferences.html:57 +#: searx/templates/simple/preferences.html:51 +msgid "Autocomplete" +msgstr "Awto-gwblhau" + +#: searx/templates/courgette/preferences.html:45 +#: searx/templates/legacy/preferences.html:46 +#: searx/templates/oscar/preferences.html:68 +#: searx/templates/simple/preferences.html:166 +msgid "Image proxy" +msgstr "" + +#: searx/templates/courgette/preferences.html:48 +#: searx/templates/legacy/preferences.html:49 +#: searx/templates/oscar/preferences.html:72 +#: searx/templates/simple/preferences.html:169 +msgid "Enabled" +msgstr "Galluogwyd" + +#: searx/templates/courgette/preferences.html:49 +#: searx/templates/legacy/preferences.html:50 +#: searx/templates/oscar/preferences.html:73 +#: searx/templates/simple/preferences.html:170 +msgid "Disabled" +msgstr "Analluogwyd" + +#: searx/templates/courgette/preferences.html:54 +#: searx/templates/legacy/preferences.html:55 +#: searx/templates/oscar/preferences.html:77 +#: searx/templates/pix-art/preferences.html:30 +#: searx/templates/simple/preferences.html:156 +msgid "Method" +msgstr "Dull" + +#: searx/templates/courgette/preferences.html:63 +#: searx/templates/legacy/preferences.html:64 +#: searx/templates/oscar/preferences.html:86 +#: searx/templates/oscar/preferences.html:165 +#: searx/templates/oscar/preferences.html:173 +#: searx/templates/simple/preferences.html:63 +#: searx/templates/simple/preferences.html:90 +msgid "SafeSearch" +msgstr "" + +#: searx/templates/courgette/preferences.html:66 +#: searx/templates/legacy/preferences.html:67 +#: searx/templates/oscar/preferences.html:90 +#: searx/templates/simple/preferences.html:66 +msgid "Strict" +msgstr "Caeth" + +#: searx/templates/courgette/preferences.html:67 +#: searx/templates/legacy/preferences.html:68 +#: searx/templates/oscar/preferences.html:91 +#: searx/templates/simple/preferences.html:67 +msgid "Moderate" +msgstr "Cymhedrol" + +#: searx/templates/courgette/preferences.html:68 +#: searx/templates/legacy/preferences.html:69 +#: searx/templates/oscar/preferences.html:92 +#: searx/templates/simple/preferences.html:68 +msgid "None" +msgstr "Dim" + +#: searx/templates/courgette/preferences.html:73 +#: searx/templates/legacy/preferences.html:74 +#: searx/templates/oscar/preferences.html:96 +#: searx/templates/pix-art/preferences.html:39 +#: searx/templates/simple/preferences.html:131 +msgid "Themes" +msgstr "Themâu" + +#: searx/templates/courgette/preferences.html:83 +msgid "Color" +msgstr "Lliw" + +#: searx/templates/courgette/preferences.html:86 +msgid "Blue (default)" +msgstr "Glas (arferol)" + +#: searx/templates/courgette/preferences.html:87 +msgid "Violet" +msgstr "Fioled" + +#: searx/templates/courgette/preferences.html:88 +msgid "Green" +msgstr "Gwyrdd" + +#: searx/templates/courgette/preferences.html:89 +msgid "Cyan" +msgstr "Gwyrddlas" + +#: searx/templates/courgette/preferences.html:90 +msgid "Orange" +msgstr "Oren" + +#: searx/templates/courgette/preferences.html:91 +msgid "Red" +msgstr "Coch" + +#: searx/templates/courgette/preferences.html:96 +#: searx/templates/legacy/preferences.html:93 +#: searx/templates/pix-art/preferences.html:49 +#: searx/templates/simple/preferences.html:77 +msgid "Currently used search engines" +msgstr "" + +#: searx/templates/courgette/preferences.html:100 +#: searx/templates/legacy/preferences.html:97 +#: searx/templates/oscar/preferences.html:162 +#: searx/templates/oscar/preferences.html:176 +#: searx/templates/pix-art/preferences.html:53 +#: searx/templates/simple/preferences.html:87 +msgid "Engine name" +msgstr "" + +#: searx/templates/courgette/preferences.html:101 +#: searx/templates/legacy/preferences.html:98 +msgid "Category" +msgstr "Categori" + +#: searx/templates/courgette/preferences.html:102 +#: searx/templates/courgette/preferences.html:113 +#: searx/templates/legacy/preferences.html:99 +#: searx/templates/legacy/preferences.html:110 +#: searx/templates/oscar/preferences.html:161 +#: searx/templates/oscar/preferences.html:177 +#: searx/templates/pix-art/preferences.html:54 +#: searx/templates/pix-art/preferences.html:64 +#: searx/templates/simple/preferences.html:86 +msgid "Allow" +msgstr "Caniatáu" + +#: searx/templates/courgette/preferences.html:102 +#: searx/templates/courgette/preferences.html:114 +#: searx/templates/legacy/preferences.html:99 +#: searx/templates/legacy/preferences.html:111 +#: searx/templates/pix-art/preferences.html:54 +#: searx/templates/pix-art/preferences.html:65 +msgid "Block" +msgstr "Rhwystro" + +#: searx/templates/courgette/preferences.html:122 +#: searx/templates/legacy/preferences.html:119 +#: searx/templates/oscar/preferences.html:297 +#: searx/templates/pix-art/preferences.html:73 +#: searx/templates/simple/preferences.html:180 +msgid "" +"These settings are stored in your cookies, this allows us not to store this " +"data about you." +msgstr "" + +#: searx/templates/courgette/preferences.html:124 +#: searx/templates/legacy/preferences.html:121 +#: searx/templates/oscar/preferences.html:299 +#: searx/templates/pix-art/preferences.html:75 +#: searx/templates/simple/preferences.html:182 +msgid "" +"These cookies serve your sole convenience, we don't use these cookies to " +"track you." +msgstr "" + +#: searx/templates/courgette/preferences.html:127 +#: searx/templates/legacy/preferences.html:124 +#: searx/templates/oscar/preferences.html:305 +#: searx/templates/pix-art/preferences.html:78 +#: searx/templates/simple/preferences.html:185 +msgid "save" +msgstr "cadw" + +#: searx/templates/courgette/preferences.html:128 +#: searx/templates/legacy/preferences.html:125 +#: searx/templates/oscar/preferences.html:307 +#: searx/templates/simple/preferences.html:186 +msgid "Reset defaults" +msgstr "Ailosod rhagosodiadau" + +#: searx/templates/courgette/preferences.html:129 +#: searx/templates/legacy/preferences.html:126 +#: searx/templates/oscar/preferences.html:306 +#: searx/templates/pix-art/preferences.html:79 +#: searx/templates/simple/preferences.html:187 +msgid "back" +msgstr "nôl" + +#: searx/templates/courgette/results.html:12 +#: searx/templates/legacy/results.html:13 +#: searx/templates/oscar/results.html:136 +#: searx/templates/simple/results.html:58 +msgid "Search URL" +msgstr "" + +#: searx/templates/courgette/results.html:16 +#: searx/templates/legacy/results.html:17 +#: searx/templates/oscar/results.html:141 +#: searx/templates/simple/results.html:62 +msgid "Download results" +msgstr "Lawrlwytho'r canlyniadau" + +#: searx/templates/courgette/results.html:34 +#: searx/templates/legacy/results.html:35 +#: searx/templates/simple/results.html:10 +msgid "Answers" +msgstr "Atebion" + +#: searx/templates/courgette/results.html:42 +#: searx/templates/legacy/results.html:43 +#: searx/templates/oscar/results.html:116 +#: searx/templates/simple/results.html:42 +msgid "Suggestions" +msgstr "Awgrymiadau" + +#: searx/templates/courgette/results.html:70 +#: searx/templates/legacy/results.html:81 +#: searx/templates/oscar/results.html:68 searx/templates/oscar/results.html:78 +#: searx/templates/simple/results.html:130 +msgid "previous page" +msgstr "tudalen ddiwethaf" + +#: searx/templates/courgette/results.html:81 +#: searx/templates/legacy/results.html:92 +#: searx/templates/oscar/results.html:62 searx/templates/oscar/results.html:84 +#: searx/templates/simple/results.html:145 +msgid "next page" +msgstr "tudalen nesaf" + +#: searx/templates/courgette/search.html:3 +#: searx/templates/legacy/search.html:3 searx/templates/oscar/search.html:6 +#: searx/templates/oscar/search_full.html:9 +#: searx/templates/pix-art/search.html:3 searx/templates/simple/search.html:4 +msgid "Search for..." +msgstr "Chwilio am..." + +#: searx/templates/courgette/stats.html:4 searx/templates/legacy/stats.html:4 +#: searx/templates/oscar/stats.html:5 searx/templates/pix-art/stats.html:4 +#: searx/templates/simple/stats.html:7 +msgid "Engine stats" +msgstr "" + +#: searx/templates/courgette/result_templates/images.html:4 +#: searx/templates/legacy/result_templates/images.html:4 +#: searx/templates/pix-art/result_templates/images.html:4 +msgid "original context" +msgstr "cyd-destun gwreiddiol" + +#: searx/templates/courgette/result_templates/torrent.html:7 +#: searx/templates/legacy/result_templates/torrent.html:11 +#: searx/templates/oscar/result_templates/torrent.html:6 +#: searx/templates/simple/result_templates/torrent.html:9 +msgid "Seeder" +msgstr "Hadau" + +#: searx/templates/courgette/result_templates/torrent.html:7 +#: searx/templates/legacy/result_templates/torrent.html:11 +#: searx/templates/oscar/result_templates/torrent.html:6 +#: searx/templates/simple/result_templates/torrent.html:9 +msgid "Leecher" +msgstr "Lawrlwythwyr" + +#: searx/templates/courgette/result_templates/torrent.html:9 +#: searx/templates/legacy/result_templates/torrent.html:9 +#: searx/templates/oscar/macros.html:23 +#: searx/templates/simple/result_templates/torrent.html:6 +msgid "magnet link" +msgstr "dolen magnet" + +#: searx/templates/courgette/result_templates/torrent.html:10 +#: searx/templates/legacy/result_templates/torrent.html:10 +#: searx/templates/oscar/macros.html:24 +#: searx/templates/simple/result_templates/torrent.html:7 +msgid "torrent file" +msgstr "ffeil torrent" + +#: searx/templates/legacy/categories.html:8 +#: searx/templates/simple/categories.html:6 +msgid "Click on the magnifier to perform search" +msgstr "Cliciwch ar y chwyddwydr i berfformio chwiliad" + +#: searx/templates/legacy/preferences.html:84 +#: searx/templates/oscar/preferences.html:113 +#: searx/templates/simple/preferences.html:142 +msgid "Results on new tabs" +msgstr "Canlyniadau mewn tabiau newydd" + +#: searx/templates/legacy/preferences.html:87 +#: searx/templates/oscar/preferences.html:117 +#: searx/templates/simple/preferences.html:145 +msgid "On" +msgstr "Ymlaen" + +#: searx/templates/legacy/preferences.html:88 +#: searx/templates/oscar/preferences.html:118 +#: searx/templates/simple/preferences.html:146 +msgid "Off" +msgstr "I ffwrdd" + +#: searx/templates/legacy/result_templates/code.html:3 +#: searx/templates/legacy/result_templates/default.html:3 +#: searx/templates/legacy/result_templates/map.html:9 +#: searx/templates/oscar/macros.html:34 searx/templates/oscar/macros.html:48 +#: searx/templates/simple/macros.html:43 +msgid "cached" +msgstr "" + +#: searx/templates/oscar/advanced.html:4 +msgid "Advanced settings" +msgstr "Gosodiadau uwch" + +#: searx/templates/oscar/base.html:62 +#: searx/templates/oscar/messages/first_time.html:4 +#: searx/templates/oscar/messages/save_settings_successfull.html:5 +#: searx/templates/oscar/messages/unknow_error.html:5 +msgid "Close" +msgstr "Cau" + +#: searx/templates/oscar/base.html:64 +#: searx/templates/oscar/messages/no_results.html:4 +#: searx/templates/simple/messages/no_results.html:4 +#: searx/templates/simple/results.html:25 +msgid "Error!" +msgstr "Gwall!" + +#: searx/templates/oscar/base.html:90 searx/templates/simple/base.html:55 +msgid "Powered by" +msgstr "Pwerwyd gan" + +#: searx/templates/oscar/base.html:90 searx/templates/simple/base.html:55 +msgid "a privacy-respecting, hackable metasearch engine" +msgstr "" + +#: searx/templates/oscar/macros.html:36 searx/templates/oscar/macros.html:50 +#: searx/templates/simple/macros.html:43 +msgid "proxied" +msgstr "" + +#: searx/templates/oscar/macros.html:92 +msgid "supported" +msgstr "cefnogir" + +#: searx/templates/oscar/macros.html:96 +msgid "not supported" +msgstr "ni chefnogir" + +#: searx/templates/oscar/preferences.html:13 +#: searx/templates/oscar/preferences.html:22 +#: searx/templates/simple/preferences.html:32 +msgid "General" +msgstr "Cyffredin" + +#: searx/templates/oscar/preferences.html:14 +#: searx/templates/oscar/preferences.html:146 +#: searx/templates/simple/preferences.html:76 +msgid "Engines" +msgstr "Peiriannau" + +#: searx/templates/oscar/preferences.html:15 +#: searx/templates/oscar/preferences.html:219 +msgid "Plugins" +msgstr "Ategolion" + +#: searx/templates/oscar/preferences.html:16 +#: searx/templates/oscar/preferences.html:245 +msgid "Answerers" +msgstr "Atebwyr" + +#: searx/templates/oscar/preferences.html:17 +#: searx/templates/oscar/preferences.html:272 +msgid "Cookies" +msgstr "Cwcis" + +#: searx/templates/oscar/preferences.html:42 +#: searx/templates/simple/preferences.html:48 +msgid "What language do you prefer for search?" +msgstr "Ym mha iaith wyt ti'n ffafrio chwilio?" + +#: searx/templates/oscar/preferences.html:48 +#: searx/templates/simple/preferences.html:128 +msgid "Change the language of the layout" +msgstr "Newid iaith rhyngwyneb searX" + +#: searx/templates/oscar/preferences.html:58 +#: searx/templates/simple/preferences.html:60 +msgid "Find stuff as you type" +msgstr "Darganfod pethau wrth i chi deipio" + +#: searx/templates/oscar/preferences.html:69 +#: searx/templates/simple/preferences.html:173 +msgid "Proxying image results through searx" +msgstr "" + +#: searx/templates/oscar/preferences.html:78 +msgid "" +"Change how forms are submited, <a " +"href=\"http://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods\"" +" rel=\"external\">learn more about request methods</a>" +msgstr "" + +#: searx/templates/oscar/preferences.html:87 +#: searx/templates/simple/preferences.html:71 +msgid "Filter content" +msgstr "" + +#: searx/templates/oscar/preferences.html:97 +#: searx/templates/simple/preferences.html:139 +msgid "Change searx layout" +msgstr "Newid cynllun searX" + +#: searx/templates/oscar/preferences.html:106 +#: searx/templates/oscar/preferences.html:111 +msgid "Choose style for this theme" +msgstr "Dewis arddull ar gyfer y thema hon" + +#: searx/templates/oscar/preferences.html:106 +#: searx/templates/oscar/preferences.html:111 +msgid "Style" +msgstr "Arddull" + +#: searx/templates/oscar/preferences.html:122 +msgid "Open Access DOI resolver" +msgstr "" + +#: searx/templates/oscar/preferences.html:123 +msgid "" +"Redirect to open-access versions of publications when available (plugin " +"required)" +msgstr "" + +#: searx/templates/oscar/preferences.html:163 +#: searx/templates/oscar/preferences.html:175 +#: searx/templates/simple/preferences.html:88 +msgid "Shortcut" +msgstr "Llwybr Byr" + +#: searx/templates/oscar/preferences.html:164 +#: searx/templates/oscar/preferences.html:174 +msgid "Selected language" +msgstr "Iaith a ddewiswyd" + +#: searx/templates/oscar/preferences.html:166 +#: searx/templates/oscar/preferences.html:172 +#: searx/templates/simple/preferences.html:91 +msgid "Time range" +msgstr "Cyfnod amser" + +#: searx/templates/oscar/preferences.html:167 +#: searx/templates/oscar/preferences.html:171 +#: searx/templates/simple/preferences.html:92 +msgid "Avg. time" +msgstr "" + +#: searx/templates/oscar/preferences.html:168 +#: searx/templates/oscar/preferences.html:170 +#: searx/templates/simple/preferences.html:93 +msgid "Max time" +msgstr "" + +#: searx/templates/oscar/preferences.html:248 +msgid "This is the list of searx's instant answering modules." +msgstr "" + +#: searx/templates/oscar/preferences.html:252 +msgid "Name" +msgstr "Enw" + +#: searx/templates/oscar/preferences.html:253 +msgid "Keywords" +msgstr "Allweddeiriau" + +#: searx/templates/oscar/preferences.html:254 +msgid "Description" +msgstr "Disgrifiad" + +#: searx/templates/oscar/preferences.html:255 +msgid "Examples" +msgstr "Enghreifftiau" + +#: searx/templates/oscar/preferences.html:275 +msgid "" +"This is the list of cookies and their values searx is storing on your " +"computer." +msgstr "Dyma restr y cwcis, a'u gwerthoedd, mae searX yn eu cadw ar eich dyfais." + +#: searx/templates/oscar/preferences.html:276 +msgid "With that list, you can assess searx transparency." +msgstr "" + +#: searx/templates/oscar/preferences.html:281 +msgid "Cookie name" +msgstr "Enw cwci" + +#: searx/templates/oscar/preferences.html:282 +msgid "Value" +msgstr "Gwerth" + +#: searx/templates/oscar/preferences.html:301 +msgid "Search URL of the currently saved preferences" +msgstr "" + +#: searx/templates/oscar/preferences.html:301 +msgid "" +"Note: specifying custom settings in the search URL can reduce privacy by " +"leaking data to the clicked result sites." +msgstr "" + +#: searx/templates/oscar/results.html:17 +msgid "Search results" +msgstr "Canlyniadau chwilio" + +#: searx/templates/oscar/results.html:21 +#: searx/templates/simple/results.html:84 +msgid "Try searching for:" +msgstr "Rho gynnig ar chwilio am:" + +#: searx/templates/oscar/results.html:100 +#: searx/templates/simple/results.html:25 +msgid "Engines cannot retrieve results" +msgstr "Ni all y peiriannau cael canlyniadau" + +#: searx/templates/oscar/results.html:131 +msgid "Links" +msgstr "Dolenni" + +#: searx/templates/oscar/search.html:8 +#: searx/templates/oscar/search_full.html:11 +#: searx/templates/simple/search.html:5 +msgid "Start search" +msgstr "Dechrau chwilio" + +#: searx/templates/oscar/stats.html:2 +msgid "stats" +msgstr "ystadegau" + +#: searx/templates/oscar/time-range.html:3 +#: searx/templates/simple/time-range.html:3 +msgid "Anytime" +msgstr "Unrhyw amser" + +#: searx/templates/oscar/time-range.html:6 +#: searx/templates/simple/time-range.html:6 +msgid "Last day" +msgstr "Y diwrnod diwethaf" + +#: searx/templates/oscar/time-range.html:9 +#: searx/templates/simple/time-range.html:9 +msgid "Last week" +msgstr "Yr wythnos diwethaf" + +#: searx/templates/oscar/time-range.html:12 +#: searx/templates/simple/time-range.html:12 +msgid "Last month" +msgstr "Y mis diwethaf" + +#: searx/templates/oscar/time-range.html:15 +#: searx/templates/simple/time-range.html:15 +msgid "Last year" +msgstr "Y flwyddyn ddiwethaf" + +#: searx/templates/oscar/messages/first_time.html:6 +#: searx/templates/oscar/messages/no_data_available.html:3 +msgid "Heads up!" +msgstr "" + +#: searx/templates/oscar/messages/first_time.html:7 +msgid "It look like you are using searx first time." +msgstr "Mae'n ymddangos eich bod yn defnyddio searx am y tro cyntaf." + +#: searx/templates/oscar/messages/no_cookies.html:3 +msgid "Information!" +msgstr "Gwybodaeth!" + +#: searx/templates/oscar/messages/no_cookies.html:4 +msgid "currently, there are no cookies defined." +msgstr "" + +#: searx/templates/oscar/messages/no_data_available.html:4 +msgid "There is currently no data available. " +msgstr "Does dim data ar gael ar hyn o bryd." + +#: searx/templates/oscar/messages/no_results.html:4 +#: searx/templates/simple/messages/no_results.html:4 +msgid "Engines cannot retrieve results." +msgstr "Ni all y peiriannau cael canlyniadau." + +#: searx/templates/oscar/messages/no_results.html:10 +#: searx/templates/simple/messages/no_results.html:10 +msgid "Please, try again later or find another searx instance." +msgstr "" + +#: searx/templates/oscar/messages/no_results.html:14 +#: searx/templates/simple/messages/no_results.html:14 +msgid "Sorry!" +msgstr "Sori!" + +#: searx/templates/oscar/messages/no_results.html:15 +#: searx/templates/simple/messages/no_results.html:15 +msgid "" +"we didn't find any results. Please use another query or search in more " +"categories." +msgstr "Ni ddaethpwyd o hyd i unrhyw ganlyniadau. Defnyddiwch derm(au) chwilio gwahanol neu ehangu'r chwilio i ragor o gategorïau." + +#: searx/templates/oscar/messages/save_settings_successfull.html:7 +msgid "Well done!" +msgstr "Da iawn!" + +#: searx/templates/oscar/messages/save_settings_successfull.html:8 +msgid "Settings saved successfully." +msgstr "Cadwyd y gosodiadau yn iawn!" + +#: searx/templates/oscar/messages/unknow_error.html:7 +msgid "Oh snap!" +msgstr "" + +#: searx/templates/oscar/messages/unknow_error.html:8 +msgid "Something went wrong." +msgstr "Aeth rhywbeth o'i le." + +#: searx/templates/oscar/result_templates/default.html:7 +#: searx/templates/simple/result_templates/default.html:6 +msgid "show media" +msgstr "dangos cyfryngau" + +#: searx/templates/oscar/result_templates/default.html:7 +#: searx/templates/simple/result_templates/default.html:6 +msgid "hide media" +msgstr "cuddio cyfryngau" + +#: searx/templates/oscar/result_templates/images.html:30 +msgid "Get image" +msgstr "Cael y ddelwedd" + +#: searx/templates/oscar/result_templates/images.html:33 +msgid "View source" +msgstr "Gweld y ffynhonnell" + +#: searx/templates/oscar/result_templates/map.html:7 +#: searx/templates/simple/result_templates/map.html:7 +msgid "show map" +msgstr "dangos map" + +#: searx/templates/oscar/result_templates/map.html:7 +#: searx/templates/simple/result_templates/map.html:7 +msgid "hide map" +msgstr "cuddio map" + +#: searx/templates/oscar/result_templates/map.html:11 +#: searx/templates/simple/result_templates/map.html:11 +msgid "show details" +msgstr "dangos manylion" + +#: searx/templates/oscar/result_templates/map.html:11 +#: searx/templates/simple/result_templates/map.html:11 +msgid "hide details" +msgstr "cuddio manylion" + +#: searx/templates/oscar/result_templates/torrent.html:7 +#: searx/templates/simple/result_templates/torrent.html:11 +msgid "Filesize" +msgstr "Maint ffeil" + +#: searx/templates/oscar/result_templates/torrent.html:9 +#: searx/templates/simple/result_templates/torrent.html:12 +msgid "Bytes" +msgstr "Beitiau" + +#: searx/templates/oscar/result_templates/torrent.html:10 +#: searx/templates/simple/result_templates/torrent.html:13 +msgid "kiB" +msgstr "kiB" + +#: searx/templates/oscar/result_templates/torrent.html:11 +#: searx/templates/simple/result_templates/torrent.html:14 +msgid "MiB" +msgstr "MiB" + +#: searx/templates/oscar/result_templates/torrent.html:12 +#: searx/templates/simple/result_templates/torrent.html:15 +msgid "GiB" +msgstr "GiB" + +#: searx/templates/oscar/result_templates/torrent.html:13 +#: searx/templates/simple/result_templates/torrent.html:16 +msgid "TiB" +msgstr "TiB" + +#: searx/templates/oscar/result_templates/torrent.html:15 +#: searx/templates/simple/result_templates/torrent.html:20 +msgid "Number of Files" +msgstr "Nifer o Ffeiliau" + +#: searx/templates/oscar/result_templates/videos.html:7 +#: searx/templates/simple/result_templates/videos.html:6 +msgid "show video" +msgstr "dangos fideo" + +#: searx/templates/oscar/result_templates/videos.html:7 +#: searx/templates/simple/result_templates/videos.html:6 +msgid "hide video" +msgstr "cuddio fideo" + +#: searx/templates/pix-art/results.html:28 +msgid "Load more..." +msgstr "Dysgu mwy..." + +#: searx/templates/simple/base.html:31 +msgid "No item found" +msgstr "Ni chanfuwyd eitem" + +#: searx/templates/simple/preferences.html:89 +msgid "Supports selected language" +msgstr "Cefnogir yr iaith a ddewiswyd" + +#: searx/templates/simple/preferences.html:118 +msgid "User interface" +msgstr "Rhyngwyneb defnyddiwr" + +#: searx/templates/simple/preferences.html:154 +msgid "Privacy" +msgstr "Preifatrwydd" diff --git a/searx/translations/da/LC_MESSAGES/messages.mo b/searx/translations/da/LC_MESSAGES/messages.mo index 21cea9ef7a..8813c0779a 100644 Binary files a/searx/translations/da/LC_MESSAGES/messages.mo and b/searx/translations/da/LC_MESSAGES/messages.mo differ diff --git a/searx/translations/de/LC_MESSAGES/messages.mo b/searx/translations/de/LC_MESSAGES/messages.mo index d6458785db..a525fbf1e8 100644 Binary files a/searx/translations/de/LC_MESSAGES/messages.mo and b/searx/translations/de/LC_MESSAGES/messages.mo differ diff --git a/searx/translations/de/LC_MESSAGES/messages.po b/searx/translations/de/LC_MESSAGES/messages.po index 2bf22911e6..64f253ebd9 100644 --- a/searx/translations/de/LC_MESSAGES/messages.po +++ b/searx/translations/de/LC_MESSAGES/messages.po @@ -12,6 +12,7 @@ # Max <theshirinzu@gmail.com>, 2015 # pointhi, 2014 # rike, 2014 +# S R <acc-transifex@rie.hm>, 2018 # stf <stefan.marsiske@gmail.com>, 2014 # stf <stefan.marsiske@gmail.com>, 2014 # Thomas Pointhuber, 2016-2017 @@ -21,8 +22,8 @@ msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" "POT-Creation-Date: 2017-11-01 21:31+0100\n" -"PO-Revision-Date: 2017-12-09 13:14+0000\n" -"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n" +"PO-Revision-Date: 2018-12-28 11:02+0000\n" +"Last-Translator: S R <acc-transifex@rie.hm>\n" "Language-Team: German (http://www.transifex.com/asciimoo/searx/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -159,25 +160,25 @@ msgstr "Keine Zusammenfassung für die Veröffentlichung verfügbar." #: searx/plugins/https_rewrite.py:32 msgid "Rewrite HTTP links to HTTPS if possible" -msgstr "Wandelt wenn möglich HTTP Links in HTTPS Links um" +msgstr "Wandelt wenn möglich HTTP-Links in HTTPS-Links um" #: searx/plugins/infinite_scroll.py:3 msgid "Infinite scroll" -msgstr "Undendliches Scrollen" +msgstr "Unendliches Scrollen" #: searx/plugins/infinite_scroll.py:4 msgid "Automatically load next page when scrolling to bottom of current page" -msgstr "Lädt automatisch die nächste Seite wenn das Ende der aktuellen Seite erreicht wurde" +msgstr "Lädt automatisch die nächste Seite, wenn das Ende der aktuellen Seite erreicht wurde" #: searx/plugins/oa_doi_rewrite.py:9 msgid "Open Access DOI rewrite" -msgstr "Open Access DOI rewrite" +msgstr "Open-Access-DOI umschreiben" #: searx/plugins/oa_doi_rewrite.py:10 msgid "" "Avoid paywalls by redirecting to open-access versions of publications when " "available" -msgstr "Bezahlbeschränkungen durch die Weiterleitung zu der verfügbaren Open-Access Version vermeiden" +msgstr "Bezahlbeschränkungen durch die Weiterleitung zu der verfügbaren Open-Access-Version vermeiden" #: searx/plugins/open_results_on_new_tab.py:18 #: searx/templates/oscar/preferences.html:114 @@ -223,7 +224,7 @@ msgstr "An Vim angelehnte Tastenkombinationen" msgid "" "Navigate search results with Vim-like hotkeys (JavaScript required). Press " "\"h\" key on main or result page to get help." -msgstr "Navigiere in der Ergebnisseite mit Vim ähnlichen Tastataurkombinationen (es wird JavaScript benötigt).\nDrücke \"h\" auf der Start bzw. Ergebnisseite um eine Hifefenster anzuzeigen" +msgstr "Navigiere in der Ergebnisseite mit Vim ähnlichen Tastaturkombinationen (es wird JavaScript benötigt).\nDrücke \"h\" auf der Start- bzw. Ergebnisseite, um ein Hifefenster anzuzeigen" #: searx/templates/courgette/404.html:4 searx/templates/legacy/404.html:4 #: searx/templates/oscar/404.html:4 searx/templates/pix-art/404.html:4 diff --git a/searx/translations/el_GR/LC_MESSAGES/messages.mo b/searx/translations/el_GR/LC_MESSAGES/messages.mo index c9798d318b..2bc6a57a37 100644 Binary files a/searx/translations/el_GR/LC_MESSAGES/messages.mo and b/searx/translations/el_GR/LC_MESSAGES/messages.mo differ diff --git a/searx/translations/en/LC_MESSAGES/messages.mo b/searx/translations/en/LC_MESSAGES/messages.mo index 9632e6ca50..0c270c06dd 100644 Binary files a/searx/translations/en/LC_MESSAGES/messages.mo and b/searx/translations/en/LC_MESSAGES/messages.mo differ diff --git a/searx/translations/eo/LC_MESSAGES/messages.mo b/searx/translations/eo/LC_MESSAGES/messages.mo index cb0bc55702..cfad4d49ed 100644 Binary files a/searx/translations/eo/LC_MESSAGES/messages.mo and b/searx/translations/eo/LC_MESSAGES/messages.mo differ diff --git a/searx/translations/eo/LC_MESSAGES/messages.po b/searx/translations/eo/LC_MESSAGES/messages.po index de31c9a4bf..cd7ffe80eb 100644 --- a/searx/translations/eo/LC_MESSAGES/messages.po +++ b/searx/translations/eo/LC_MESSAGES/messages.po @@ -6,13 +6,14 @@ # Jack Stehn <jaxadeo@gmail.com>, 2017 # juanda097 <juanda097@protonmail.ch>, 2015-2016 # pizzaiolo, 2016 +# Václav Zouzalík <Vaclav.Zouzalik@seznam.cz>, 2018 msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" "POT-Creation-Date: 2017-11-01 21:31+0100\n" -"PO-Revision-Date: 2017-11-01 20:31+0000\n" -"Last-Translator: Adam Tauber <asciimoo@gmail.com>\n" +"PO-Revision-Date: 2018-11-22 08:33+0000\n" +"Last-Translator: Václav Zouzalík <Vaclav.Zouzalik@seznam.cz>\n" "Language-Team: Esperanto (http://www.transifex.com/asciimoo/searx/language/eo/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -23,15 +24,15 @@ msgstr "" #: searx/search.py:137 searx/search.py:182 msgid "timeout" -msgstr "" +msgstr "tempolimo" #: searx/search.py:144 msgid "request exception" -msgstr "" +msgstr "escepto de peto" #: searx/search.py:151 msgid "unexpected crash" -msgstr "" +msgstr "neatendita paneo" #: searx/webapp.py:136 msgid "files" @@ -47,7 +48,7 @@ msgstr "muziko" #: searx/webapp.py:139 msgid "social media" -msgstr "sociaj retservoj" +msgstr "sociaj retoj" #: searx/webapp.py:140 msgid "images" @@ -75,11 +76,11 @@ msgstr "scienco" #: searx/webapp.py:399 searx/webapp.py:658 msgid "Invalid settings, please edit your preferences" -msgstr "" +msgstr "Nevalidaj agordoj, bonvolu redakti viajn agordojn" #: searx/webapp.py:415 msgid "Invalid settings" -msgstr "" +msgstr "Nevalidaj agordoj" #: searx/webapp.py:449 searx/webapp.py:493 msgid "search error" @@ -95,23 +96,23 @@ msgstr "antaŭ {hours} horo(j), {minutes} minuto(j)" #: searx/answerers/random/answerer.py:53 msgid "Random value generator" -msgstr "" +msgstr "Hazardvalora generilo" #: searx/answerers/random/answerer.py:54 msgid "Generate different random values" -msgstr "" +msgstr "Ĝi generas diversajn hazardajn valorojn" #: searx/answerers/statistics/answerer.py:53 msgid "Statistics functions" -msgstr "" +msgstr "Statistikaj funkcioj" #: searx/answerers/statistics/answerer.py:54 msgid "Compute {functions} of the arguments" -msgstr "" +msgstr "Kalkulas {functions} el la argumentoj" #: searx/engines/__init__.py:194 searx/engines/flycheck___init__.py:201 msgid "Engine time (sec)" -msgstr "" +msgstr "Motora tempo (s)" #: searx/engines/__init__.py:198 searx/engines/flycheck___init__.py:205 msgid "Page loads (sec)" @@ -137,19 +138,19 @@ msgstr "Eraroj" #: searx/engines/pdbe.py:87 msgid "{title} (OBSOLETE)" -msgstr "" +msgstr "{title} (MALNOVA)" #: searx/engines/pdbe.py:91 msgid "This entry has been superseded by" -msgstr "" +msgstr "Tiu ĉi enigo estis anstataŭigita per" #: searx/engines/pubmed.py:74 msgid "No abstract is available for this publication." -msgstr "" +msgstr "Neniu resumo atingeblas por tiu ĉi eldonaĵo." #: searx/plugins/https_rewrite.py:32 msgid "Rewrite HTTP links to HTTPS if possible" -msgstr "Reverki HTTP ligiloj HTTP se eble" +msgstr "Ŝanĝi HTTP-ligilojn al HTTPS, se eblas" #: searx/plugins/infinite_scroll.py:3 msgid "Infinite scroll" @@ -157,17 +158,17 @@ msgstr "Senfina rulumado" #: searx/plugins/infinite_scroll.py:4 msgid "Automatically load next page when scrolling to bottom of current page" -msgstr "Aŭtomate ŝarĝi la sekvan paĝon kiam rulumante al la subo de la nuna paĝo" +msgstr "Aŭtomate ŝarĝi sekvan paĝon rulumante al la subo de la nuna paĝo" #: searx/plugins/oa_doi_rewrite.py:9 msgid "Open Access DOI rewrite" -msgstr "" +msgstr "Malfermalira COI-ŝanĝo" #: searx/plugins/oa_doi_rewrite.py:10 msgid "" "Avoid paywalls by redirecting to open-access versions of publications when " "available" -msgstr "Eviti pagomurojn alidirektante al liberaj versioj de eldonaĵoj kiam eblas" +msgstr "Eviti pagomurojn per direkto al malfermaliraj versioj de eldonaĵoj, se eblas" #: searx/plugins/open_results_on_new_tab.py:18 #: searx/templates/oscar/preferences.html:114 @@ -179,7 +180,7 @@ msgstr "Malfermi rezultligilojn en novaj retumilaj langetoj" msgid "" "Results are opened in the same window by default. This plugin overwrites the" " default behaviour to open links on new tabs/windows. (JavaScript required)" -msgstr "Oni malfermas rezultojn en la sama langeto defaŭlte. Ĉi tiu aldonaĵo ŝanĝas la kutima agmaniero por malfermi ligilojn en novaj langetoj/fenestroj. (ĜavaSkripto bezonata)" +msgstr "Oni malfermas rezultojn en la sama langeto defaŭlte. Ĉi tiu aldonaĵo ŝanĝas la kutiman agmanieron por malfermi ligilojn en novaj langetoj/fenestroj. (ĜavoSkripto bezonata)" #: searx/plugins/search_on_category_select.py:18 msgid "Search on category select" @@ -189,7 +190,7 @@ msgstr "Serĉi en elektita kategorio" msgid "" "Perform search immediately if a category selected. Disable to select " "multiple categories. (JavaScript required)" -msgstr "Serĉi tuj se oni elektas kategorion. Malŝaltu ĝin por elekti plurajn kategoriojn (ĜavaSkripto bezonata)" +msgstr "Serĉi tuj se oni elektas kategorion. Malŝaltu ĝin por elekti plurajn kategoriojn (ĜavoSkripto bezonata)" #: searx/plugins/self_info.py:20 msgid "" @@ -203,7 +204,7 @@ msgstr "Forigilo de URL-spuriloj" #: searx/plugins/tracker_url_remover.py:27 msgid "Remove trackers arguments from the returned URL" -msgstr "Forviŝi spuraj esprimoj de la URL" +msgstr "Forviŝi spurajn argumentojn el la ricevita URL" #: searx/plugins/vim_hotkeys.py:3 msgid "Vim-like hotkeys" @@ -213,7 +214,7 @@ msgstr "Vim-ŝajnaj klavkomandoj" msgid "" "Navigate search results with Vim-like hotkeys (JavaScript required). Press " "\"h\" key on main or result page to get help." -msgstr "Tranavigi serĉrezultojn per Vim-ŝajnaj klavkomandoj (ĜavaSkripto bezonata). Premu \"h\" por helptekstaro en rezultpaĝo." +msgstr "Tranavigi serĉrezultojn per Vim-ŝajnaj klavkomandoj (ĜavoSkripto bezonata). Premu \"h\" por helptekstaro en ĉef- aŭ rezultpaĝo." #: searx/templates/courgette/404.html:4 searx/templates/legacy/404.html:4 #: searx/templates/oscar/404.html:4 searx/templates/pix-art/404.html:4 @@ -242,7 +243,7 @@ msgstr "Serĉopaĝo" #: searx/templates/oscar/preferences.html:3 #: searx/templates/pix-art/index.html:8 msgid "preferences" -msgstr "preferoj" +msgstr "agordoj" #: searx/templates/courgette/index.html:11 #: searx/templates/legacy/index.html:10 searx/templates/oscar/about.html:2 @@ -256,7 +257,7 @@ msgstr "pri" #: searx/templates/pix-art/preferences.html:5 #: searx/templates/simple/preferences.html:26 msgid "Preferences" -msgstr "Preferoj" +msgstr "Agordoj" #: searx/templates/courgette/preferences.html:9 #: searx/templates/legacy/preferences.html:9 @@ -282,7 +283,7 @@ msgstr "Serĉolingvo" #: searx/templates/simple/languages.html:2 #: searx/templates/simple/preferences.html:42 msgid "Default language" -msgstr "" +msgstr "Defaŭlta lingvo" #: searx/templates/courgette/preferences.html:24 #: searx/templates/legacy/preferences.html:25 @@ -400,7 +401,7 @@ msgstr "Ruĝa" #: searx/templates/pix-art/preferences.html:49 #: searx/templates/simple/preferences.html:77 msgid "Currently used search engines" -msgstr " Aktuale uzitajn serĉilojn" +msgstr " Aktuale uzataj serĉiloj" #: searx/templates/courgette/preferences.html:100 #: searx/templates/legacy/preferences.html:97 @@ -445,7 +446,7 @@ msgstr "Bloki" msgid "" "These settings are stored in your cookies, this allows us not to store this " "data about you." -msgstr "Tiuj agordoj estas konservitaj en viaj kuketoj kaj tio eblas, ke ni ne konservu tiujn datumojn pri vi." +msgstr "Tiuj ĉi agordoj estas konservitaj en viaj kuketoj, kio ebligas al ni ne konservi tiujn datumojn pri vi en nia servilo." #: searx/templates/courgette/preferences.html:124 #: searx/templates/legacy/preferences.html:121 @@ -478,7 +479,7 @@ msgstr "Reagordi al defaŭlto" #: searx/templates/pix-art/preferences.html:79 #: searx/templates/simple/preferences.html:187 msgid "back" -msgstr "antaŭe" +msgstr "antaŭen" #: searx/templates/courgette/results.html:12 #: searx/templates/legacy/results.html:13 @@ -492,7 +493,7 @@ msgstr "Serĉi URL" #: searx/templates/oscar/results.html:141 #: searx/templates/simple/results.html:62 msgid "Download results" -msgstr "Alŝutaj rezultoj" +msgstr "Elŝuti rezultojn" #: searx/templates/courgette/results.html:34 #: searx/templates/legacy/results.html:35 @@ -519,7 +520,7 @@ msgstr " antaŭa paĝo" #: searx/templates/oscar/results.html:62 searx/templates/oscar/results.html:84 #: searx/templates/simple/results.html:145 msgid "next page" -msgstr " sekvanta paĝo" +msgstr " sekva paĝo" #: searx/templates/courgette/search.html:3 #: searx/templates/legacy/search.html:3 searx/templates/oscar/search.html:6 @@ -615,11 +616,11 @@ msgstr "Fermi" #: searx/templates/simple/messages/no_results.html:4 #: searx/templates/simple/results.html:25 msgid "Error!" -msgstr "" +msgstr "Eraro!" #: searx/templates/oscar/base.html:90 searx/templates/simple/base.html:55 msgid "Powered by" -msgstr "Funkciigita de" +msgstr "Funkciigita per" #: searx/templates/oscar/base.html:90 searx/templates/simple/base.html:55 msgid "a privacy-respecting, hackable metasearch engine" @@ -628,15 +629,15 @@ msgstr "kodumebla metaserĉilo kiu respektas vian privatecon" #: searx/templates/oscar/macros.html:36 searx/templates/oscar/macros.html:50 #: searx/templates/simple/macros.html:43 msgid "proxied" -msgstr "" +msgstr "prokurata" #: searx/templates/oscar/macros.html:92 msgid "supported" -msgstr "" +msgstr "subtenata" #: searx/templates/oscar/macros.html:96 msgid "not supported" -msgstr "" +msgstr "nesubtenata" #: searx/templates/oscar/preferences.html:13 #: searx/templates/oscar/preferences.html:22 @@ -658,7 +659,7 @@ msgstr "Aldonaĵoj" #: searx/templates/oscar/preferences.html:16 #: searx/templates/oscar/preferences.html:245 msgid "Answerers" -msgstr "" +msgstr "Respondiloj" #: searx/templates/oscar/preferences.html:17 #: searx/templates/oscar/preferences.html:272 @@ -673,7 +674,7 @@ msgstr "Kiun lingvon vi pli ŝatas por serĉi?" #: searx/templates/oscar/preferences.html:48 #: searx/templates/simple/preferences.html:128 msgid "Change the language of the layout" -msgstr "Ŝanĝi la fasonadan lingvon" +msgstr "Ŝanĝi lingvon de la fasono" #: searx/templates/oscar/preferences.html:58 #: searx/templates/simple/preferences.html:60 @@ -690,7 +691,7 @@ msgid "" "Change how forms are submited, <a " "href=\"http://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods\"" " rel=\"external\">learn more about request methods</a>" -msgstr " Ŝanĝi kiel formoj estas senditaj, < href=\"http://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods\" rel=\"external\"> Lerni pli pri peto-metodoj</> " +msgstr "Ŝanĝi kiel formoj estas sendataj, <a href=\"http://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods\" rel=\"external\">sciu pli pri peto-metodoj</a> " #: searx/templates/oscar/preferences.html:87 #: searx/templates/simple/preferences.html:71 @@ -700,7 +701,7 @@ msgstr "Filtri enhavon" #: searx/templates/oscar/preferences.html:97 #: searx/templates/simple/preferences.html:139 msgid "Change searx layout" -msgstr "Ŝanĝi searx-fasonadon" +msgstr "Ŝanĝi fasonon de Searx" #: searx/templates/oscar/preferences.html:106 #: searx/templates/oscar/preferences.html:111 @@ -714,13 +715,13 @@ msgstr "Stilo" #: searx/templates/oscar/preferences.html:122 msgid "Open Access DOI resolver" -msgstr "" +msgstr "Malfermalira COI-solvilo" #: searx/templates/oscar/preferences.html:123 msgid "" "Redirect to open-access versions of publications when available (plugin " "required)" -msgstr "" +msgstr "Direkti al malfermaliraj versioj de eldonaĵoj, se eblas (aldonaĵo necesas)" #: searx/templates/oscar/preferences.html:163 #: searx/templates/oscar/preferences.html:175 @@ -731,13 +732,13 @@ msgstr "Fulmoklavo" #: searx/templates/oscar/preferences.html:164 #: searx/templates/oscar/preferences.html:174 msgid "Selected language" -msgstr "" +msgstr "Elekti lingvon" #: searx/templates/oscar/preferences.html:166 #: searx/templates/oscar/preferences.html:172 #: searx/templates/simple/preferences.html:91 msgid "Time range" -msgstr "" +msgstr "Tempa intervalo" #: searx/templates/oscar/preferences.html:167 #: searx/templates/oscar/preferences.html:171 @@ -753,29 +754,29 @@ msgstr "Maksimuma tempo" #: searx/templates/oscar/preferences.html:248 msgid "This is the list of searx's instant answering modules." -msgstr "" +msgstr "Tio ĉi estas listo de tuje respondantaj moduloj de Searx." #: searx/templates/oscar/preferences.html:252 msgid "Name" -msgstr "" +msgstr "Nomo" #: searx/templates/oscar/preferences.html:253 msgid "Keywords" -msgstr "" +msgstr "Ŝlosilvortoj" #: searx/templates/oscar/preferences.html:254 msgid "Description" -msgstr "" +msgstr "Priskribo" #: searx/templates/oscar/preferences.html:255 msgid "Examples" -msgstr "" +msgstr "Ekzemploj" #: searx/templates/oscar/preferences.html:275 msgid "" "This is the list of cookies and their values searx is storing on your " "computer." -msgstr "Ĉi tiu estas la listo de kuketoj kaj siaj valoroj, kiujn searx konservas en via komputilo." +msgstr "Ĉi tio estas listo de kuketoj kaj iliaj valoroj, kiujn searx konservas en via komputilo." #: searx/templates/oscar/preferences.html:276 msgid "With that list, you can assess searx transparency." @@ -791,13 +792,13 @@ msgstr "Valoro" #: searx/templates/oscar/preferences.html:301 msgid "Search URL of the currently saved preferences" -msgstr "" +msgstr "Serĉo-URL kun aktuale konservitaj agordoj" #: searx/templates/oscar/preferences.html:301 msgid "" "Note: specifying custom settings in the search URL can reduce privacy by " "leaking data to the clicked result sites." -msgstr "" +msgstr "Rimarko: Precizigo de propraj agordoj en la serĉo-URL povas malaltigi privatecon per nevola diskonigo de la datumoj al alklikantaj retejoj." #: searx/templates/oscar/results.html:17 msgid "Search results" @@ -806,12 +807,12 @@ msgstr "Serĉrezultoj" #: searx/templates/oscar/results.html:21 #: searx/templates/simple/results.html:84 msgid "Try searching for:" -msgstr "" +msgstr "Provu serĉi:" #: searx/templates/oscar/results.html:100 #: searx/templates/simple/results.html:25 msgid "Engines cannot retrieve results" -msgstr "" +msgstr "Motoroj ne povas trovi rezultojn" #: searx/templates/oscar/results.html:131 msgid "Links" @@ -830,7 +831,7 @@ msgstr "statistikoj" #: searx/templates/oscar/time-range.html:3 #: searx/templates/simple/time-range.html:3 msgid "Anytime" -msgstr "Ie" +msgstr "Iam ajn" #: searx/templates/oscar/time-range.html:6 #: searx/templates/simple/time-range.html:6 @@ -850,7 +851,7 @@ msgstr "Pasinta monato" #: searx/templates/oscar/time-range.html:15 #: searx/templates/simple/time-range.html:15 msgid "Last year" -msgstr "" +msgstr "Pasinta jaro" #: searx/templates/oscar/messages/first_time.html:6 #: searx/templates/oscar/messages/no_data_available.html:3 @@ -859,7 +860,7 @@ msgstr "Atentu!" #: searx/templates/oscar/messages/first_time.html:7 msgid "It look like you are using searx first time." -msgstr "Ŝajnas, ke ĉi tiu estas via unua fojo uzante searx" +msgstr "Ŝajnas, ke ĉi tio estas via unua fojo, kiam vi uzas searx." #: searx/templates/oscar/messages/no_cookies.html:3 msgid "Information!" @@ -867,7 +868,7 @@ msgstr "Informoj!" #: searx/templates/oscar/messages/no_cookies.html:4 msgid "currently, there are no cookies defined." -msgstr "ĉi-momente, ne estas kuketoj difinitaj." +msgstr "nun ne estas ajnaj kuketoj difinitaj." #: searx/templates/oscar/messages/no_data_available.html:4 msgid "There is currently no data available. " @@ -876,17 +877,17 @@ msgstr "Nun ne estas datumoj disponeblaj." #: searx/templates/oscar/messages/no_results.html:4 #: searx/templates/simple/messages/no_results.html:4 msgid "Engines cannot retrieve results." -msgstr "" +msgstr "Motoroj ne povas trovi rezultojn." #: searx/templates/oscar/messages/no_results.html:10 #: searx/templates/simple/messages/no_results.html:10 msgid "Please, try again later or find another searx instance." -msgstr "" +msgstr "Bonvolu provi ĝin poste aŭ trovi aliajn searx-instancon." #: searx/templates/oscar/messages/no_results.html:14 #: searx/templates/simple/messages/no_results.html:14 msgid "Sorry!" -msgstr "Mizera!" +msgstr "Pardonu!" #: searx/templates/oscar/messages/no_results.html:15 #: searx/templates/simple/messages/no_results.html:15 @@ -952,7 +953,7 @@ msgstr "kaŝi detalojn" #: searx/templates/oscar/result_templates/torrent.html:7 #: searx/templates/simple/result_templates/torrent.html:11 msgid "Filesize" -msgstr "Dosiergrando" +msgstr "Dosiergrandeco" #: searx/templates/oscar/result_templates/torrent.html:9 #: searx/templates/simple/result_templates/torrent.html:12 @@ -1000,16 +1001,16 @@ msgstr "Ŝarĝi pli..." #: searx/templates/simple/base.html:31 msgid "No item found" -msgstr "" +msgstr "Nenio trovita" #: searx/templates/simple/preferences.html:89 msgid "Supports selected language" -msgstr "" +msgstr "Subtenas elektitan lingvon" #: searx/templates/simple/preferences.html:118 msgid "User interface" -msgstr "" +msgstr "Fasado" #: searx/templates/simple/preferences.html:154 msgid "Privacy" -msgstr "" +msgstr "Privateco" diff --git a/searx/translations/es/LC_MESSAGES/messages.mo b/searx/translations/es/LC_MESSAGES/messages.mo index c8c08316e9..358cce8cbd 100644 Binary files a/searx/translations/es/LC_MESSAGES/messages.mo and b/searx/translations/es/LC_MESSAGES/messages.mo differ diff --git a/searx/translations/eu/LC_MESSAGES/messages.mo b/searx/translations/eu/LC_MESSAGES/messages.mo new file mode 100644 index 0000000000..db58fdc84a Binary files /dev/null and b/searx/translations/eu/LC_MESSAGES/messages.mo differ diff --git a/searx/translations/eu/LC_MESSAGES/messages.po b/searx/translations/eu/LC_MESSAGES/messages.po new file mode 100644 index 0000000000..b6fa194e10 --- /dev/null +++ b/searx/translations/eu/LC_MESSAGES/messages.po @@ -0,0 +1,1015 @@ +# Translations template for PROJECT. +# Copyright (C) 2017 ORGANIZATION +# This file is distributed under the same license as the PROJECT project. +# +# Translators: +# beriain <beriain@bitmessage.ch>, 2018 +# beriain <beriain@bitmessage.ch>, 2018 +# Txopi <txopi@ikusimakusi.eus>, 2016 +msgid "" +msgstr "" +"Project-Id-Version: searx\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2017-11-01 21:31+0100\n" +"PO-Revision-Date: 2018-11-06 16:39+0000\n" +"Last-Translator: beriain <beriain@bitmessage.ch>\n" +"Language-Team: Basque (http://www.transifex.com/asciimoo/searx/language/eu/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 2.3.4\n" +"Language: eu\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: searx/search.py:137 searx/search.py:182 +msgid "timeout" +msgstr "denbora agortzea" + +#: searx/search.py:144 +msgid "request exception" +msgstr "salbuespena eskaeran" + +#: searx/search.py:151 +msgid "unexpected crash" +msgstr "ustekabeko gelditzea" + +#: searx/webapp.py:136 +msgid "files" +msgstr "fitxategiak" + +#: searx/webapp.py:137 +msgid "general" +msgstr "orokorra" + +#: searx/webapp.py:138 +msgid "music" +msgstr "musika" + +#: searx/webapp.py:139 +msgid "social media" +msgstr "multimedia soziala" + +#: searx/webapp.py:140 +msgid "images" +msgstr "irudiak" + +#: searx/webapp.py:141 +msgid "videos" +msgstr "bideoak" + +#: searx/webapp.py:142 +msgid "it" +msgstr "it" + +#: searx/webapp.py:143 +msgid "news" +msgstr "berriak" + +#: searx/webapp.py:144 +msgid "map" +msgstr "mapa" + +#: searx/webapp.py:145 +msgid "science" +msgstr "zientzia" + +#: searx/webapp.py:399 searx/webapp.py:658 +msgid "Invalid settings, please edit your preferences" +msgstr "Ezarpen ez baliodunak, mesedez editatu zure hobespenak" + +#: searx/webapp.py:415 +msgid "Invalid settings" +msgstr "Ezarpen ez baliodunak" + +#: searx/webapp.py:449 searx/webapp.py:493 +msgid "search error" +msgstr "bilaketa akatsa" + +#: searx/webapp.py:530 +msgid "{minutes} minute(s) ago" +msgstr "duela {minutes} minutu" + +#: searx/webapp.py:532 +msgid "{hours} hour(s), {minutes} minute(s) ago" +msgstr "duela {hours} ordu eta {minutes} minutu" + +#: searx/answerers/random/answerer.py:53 +msgid "Random value generator" +msgstr "Ausazko balio sortzailea" + +#: searx/answerers/random/answerer.py:54 +msgid "Generate different random values" +msgstr "Ausazko balio ezberdinak sortu" + +#: searx/answerers/statistics/answerer.py:53 +msgid "Statistics functions" +msgstr "Funtzio estatistikoak" + +#: searx/answerers/statistics/answerer.py:54 +msgid "Compute {functions} of the arguments" +msgstr "Parametroen {functions} zenbatu" + +#: searx/engines/__init__.py:194 searx/engines/flycheck___init__.py:201 +msgid "Engine time (sec)" +msgstr "Bilatzailearen denbora (seg)" + +#: searx/engines/__init__.py:198 searx/engines/flycheck___init__.py:205 +msgid "Page loads (sec)" +msgstr "Orri kargak (seg)" + +#: searx/engines/__init__.py:202 searx/engines/flycheck___init__.py:209 +#: searx/templates/oscar/results.html:95 +#: searx/templates/simple/results.html:20 +msgid "Number of results" +msgstr "Emaitza kopurua" + +#: searx/engines/__init__.py:206 searx/engines/flycheck___init__.py:213 +msgid "Scores" +msgstr "Balorazioak" + +#: searx/engines/__init__.py:210 searx/engines/flycheck___init__.py:217 +msgid "Scores per result" +msgstr "Balorazioak emaitza bakoitzeko" + +#: searx/engines/__init__.py:214 searx/engines/flycheck___init__.py:221 +msgid "Errors" +msgstr "Erroreak" + +#: searx/engines/pdbe.py:87 +msgid "{title} (OBSOLETE)" +msgstr "{title} (ZAHARKITUA)" + +#: searx/engines/pdbe.py:91 +msgid "This entry has been superseded by" +msgstr "Sarrera hau hurrengoarekin ordezkatu da" + +#: searx/engines/pubmed.py:74 +msgid "No abstract is available for this publication." +msgstr "Ez dago abstrakturik eskuragarri argitalpen honetarako." + +#: searx/plugins/https_rewrite.py:32 +msgid "Rewrite HTTP links to HTTPS if possible" +msgstr "HTTP loturak HTTPS bihurtu ahal denean" + +#: searx/plugins/infinite_scroll.py:3 +msgid "Infinite scroll" +msgstr "Korritze amaigabea" + +#: searx/plugins/infinite_scroll.py:4 +msgid "Automatically load next page when scrolling to bottom of current page" +msgstr "Hurrengo orria automatikoki kargatu uneko orriaren behekaldera mugitzerakoan" + +#: searx/plugins/oa_doi_rewrite.py:9 +msgid "Open Access DOI rewrite" +msgstr "Berridatzi Open Access DOI" + +#: searx/plugins/oa_doi_rewrite.py:10 +msgid "" +"Avoid paywalls by redirecting to open-access versions of publications when " +"available" +msgstr "Ordainketa hormak sahiestu argitalpenen sartze-askeko bertsioetara berbidaliz ahal denean" + +#: searx/plugins/open_results_on_new_tab.py:18 +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/simple/preferences.html:149 +msgid "Open result links on new browser tabs" +msgstr "Emaitzen estekak nabigatzailearen fitxa berrietan ireki" + +#: searx/plugins/open_results_on_new_tab.py:19 +msgid "" +"Results are opened in the same window by default. This plugin overwrites the" +" default behaviour to open links on new tabs/windows. (JavaScript required)" +msgstr "Emaitzak leiho berdinean irekitzen dira lehenetsi bezala. Plugin honek lehenetsitako jokabidea aldatzen du estekak fitxa/leiho berrietan irekitzeko. (JavaScript behar du)" + +#: searx/plugins/search_on_category_select.py:18 +msgid "Search on category select" +msgstr "Bilatu kategoria hautatzerakoan" + +#: searx/plugins/search_on_category_select.py:19 +msgid "" +"Perform search immediately if a category selected. Disable to select " +"multiple categories. (JavaScript required)" +msgstr "Bilaketa egin kategoria hautatu bezain laster. Ezgaitu ezazu hainbat kategoria hautatu ahal izateko. (JavaScript behar du)" + +#: searx/plugins/self_info.py:20 +msgid "" +"Displays your IP if the query is \"ip\" and your user agent if the query " +"contains \"user agent\"." +msgstr "Zure IPa erakutsi bilatutakoa \"ip\" bada eta zure user agenta bilatutakoa \"user agent\" bada." + +#: searx/plugins/tracker_url_remover.py:26 +msgid "Tracker URL remover" +msgstr "URL aztarnariak kendu" + +#: searx/plugins/tracker_url_remover.py:27 +msgid "Remove trackers arguments from the returned URL" +msgstr "Aztarnarien argumentuak kendu itzulitako URLtik" + +#: searx/plugins/vim_hotkeys.py:3 +msgid "Vim-like hotkeys" +msgstr "Vim antzeko laster-teklak" + +#: searx/plugins/vim_hotkeys.py:4 +msgid "" +"Navigate search results with Vim-like hotkeys (JavaScript required). Press " +"\"h\" key on main or result page to get help." +msgstr "Emaitzetan zehar Vim bezalako tekla azkarrekin nabigatu (JavaScript behar du). Sakatu \"h\" tekla orri nagusian edo emaitzen orrian laguntza ikusteko." + +#: searx/templates/courgette/404.html:4 searx/templates/legacy/404.html:4 +#: searx/templates/oscar/404.html:4 searx/templates/pix-art/404.html:4 +#: searx/templates/simple/404.html:4 +msgid "Page not found" +msgstr "Orria ez da aurkitu" + +#: searx/templates/courgette/404.html:6 searx/templates/legacy/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +#: searx/templates/simple/404.html:6 +#, python-format +msgid "Go to %(search_page)s." +msgstr "%(search_page)s(e)ra joan." + +#: searx/templates/courgette/404.html:6 searx/templates/legacy/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +#: searx/templates/simple/404.html:6 +msgid "search page" +msgstr "bilaketa orria" + +#: searx/templates/courgette/index.html:9 +#: searx/templates/courgette/index.html:13 +#: searx/templates/courgette/results.html:5 +#: searx/templates/legacy/index.html:8 searx/templates/legacy/index.html:12 +#: searx/templates/oscar/navbar.html:7 +#: searx/templates/oscar/preferences.html:3 +#: searx/templates/pix-art/index.html:8 +msgid "preferences" +msgstr "hobespenak" + +#: searx/templates/courgette/index.html:11 +#: searx/templates/legacy/index.html:10 searx/templates/oscar/about.html:2 +#: searx/templates/oscar/navbar.html:6 searx/templates/pix-art/index.html:7 +msgid "about" +msgstr "honi buruz" + +#: searx/templates/courgette/preferences.html:5 +#: searx/templates/legacy/preferences.html:5 +#: searx/templates/oscar/preferences.html:8 +#: searx/templates/pix-art/preferences.html:5 +#: searx/templates/simple/preferences.html:26 +msgid "Preferences" +msgstr "Hobespenak" + +#: searx/templates/courgette/preferences.html:9 +#: searx/templates/legacy/preferences.html:9 +#: searx/templates/oscar/preferences.html:33 +#: searx/templates/oscar/preferences.html:35 +#: searx/templates/simple/preferences.html:34 +msgid "Default categories" +msgstr "Lehenetsitako kategoriak" + +#: searx/templates/courgette/preferences.html:13 +#: searx/templates/legacy/preferences.html:14 +#: searx/templates/oscar/preferences.html:41 +#: searx/templates/pix-art/preferences.html:9 +#: searx/templates/simple/preferences.html:39 +#: searx/templates/simple/preferences.html:163 +msgid "Search language" +msgstr "Bilaketaren hizkuntza" + +#: searx/templates/courgette/preferences.html:16 +#: searx/templates/legacy/preferences.html:17 +#: searx/templates/oscar/languages.html:6 +#: searx/templates/pix-art/preferences.html:12 +#: searx/templates/simple/languages.html:2 +#: searx/templates/simple/preferences.html:42 +msgid "Default language" +msgstr "Lehenetsitako hizkuntza" + +#: searx/templates/courgette/preferences.html:24 +#: searx/templates/legacy/preferences.html:25 +#: searx/templates/oscar/preferences.html:47 +#: searx/templates/pix-art/preferences.html:20 +#: searx/templates/simple/preferences.html:120 +msgid "Interface language" +msgstr "Interfazearen hizkuntza" + +#: searx/templates/courgette/preferences.html:34 +#: searx/templates/legacy/preferences.html:35 +#: searx/templates/oscar/preferences.html:57 +#: searx/templates/simple/preferences.html:51 +msgid "Autocomplete" +msgstr "Osatze automatikoa" + +#: searx/templates/courgette/preferences.html:45 +#: searx/templates/legacy/preferences.html:46 +#: searx/templates/oscar/preferences.html:68 +#: searx/templates/simple/preferences.html:166 +msgid "Image proxy" +msgstr "Irudietarako proxya" + +#: searx/templates/courgette/preferences.html:48 +#: searx/templates/legacy/preferences.html:49 +#: searx/templates/oscar/preferences.html:72 +#: searx/templates/simple/preferences.html:169 +msgid "Enabled" +msgstr "Gaituta" + +#: searx/templates/courgette/preferences.html:49 +#: searx/templates/legacy/preferences.html:50 +#: searx/templates/oscar/preferences.html:73 +#: searx/templates/simple/preferences.html:170 +msgid "Disabled" +msgstr "Desgaituta" + +#: searx/templates/courgette/preferences.html:54 +#: searx/templates/legacy/preferences.html:55 +#: searx/templates/oscar/preferences.html:77 +#: searx/templates/pix-art/preferences.html:30 +#: searx/templates/simple/preferences.html:156 +msgid "Method" +msgstr "Metodoa" + +#: searx/templates/courgette/preferences.html:63 +#: searx/templates/legacy/preferences.html:64 +#: searx/templates/oscar/preferences.html:86 +#: searx/templates/oscar/preferences.html:165 +#: searx/templates/oscar/preferences.html:173 +#: searx/templates/simple/preferences.html:63 +#: searx/templates/simple/preferences.html:90 +msgid "SafeSearch" +msgstr "Bilaketa segurua" + +#: searx/templates/courgette/preferences.html:66 +#: searx/templates/legacy/preferences.html:67 +#: searx/templates/oscar/preferences.html:90 +#: searx/templates/simple/preferences.html:66 +msgid "Strict" +msgstr "Zorrotza" + +#: searx/templates/courgette/preferences.html:67 +#: searx/templates/legacy/preferences.html:68 +#: searx/templates/oscar/preferences.html:91 +#: searx/templates/simple/preferences.html:67 +msgid "Moderate" +msgstr "Moderatua" + +#: searx/templates/courgette/preferences.html:68 +#: searx/templates/legacy/preferences.html:69 +#: searx/templates/oscar/preferences.html:92 +#: searx/templates/simple/preferences.html:68 +msgid "None" +msgstr "Bat ere ez" + +#: searx/templates/courgette/preferences.html:73 +#: searx/templates/legacy/preferences.html:74 +#: searx/templates/oscar/preferences.html:96 +#: searx/templates/pix-art/preferences.html:39 +#: searx/templates/simple/preferences.html:131 +msgid "Themes" +msgstr "Itxurak" + +#: searx/templates/courgette/preferences.html:83 +msgid "Color" +msgstr "Kolorea" + +#: searx/templates/courgette/preferences.html:86 +msgid "Blue (default)" +msgstr "Urdina (lehenetsia)" + +#: searx/templates/courgette/preferences.html:87 +msgid "Violet" +msgstr "Bioleta" + +#: searx/templates/courgette/preferences.html:88 +msgid "Green" +msgstr "Berdea" + +#: searx/templates/courgette/preferences.html:89 +msgid "Cyan" +msgstr "Zian" + +#: searx/templates/courgette/preferences.html:90 +msgid "Orange" +msgstr "Laranja" + +#: searx/templates/courgette/preferences.html:91 +msgid "Red" +msgstr "Gorria" + +#: searx/templates/courgette/preferences.html:96 +#: searx/templates/legacy/preferences.html:93 +#: searx/templates/pix-art/preferences.html:49 +#: searx/templates/simple/preferences.html:77 +msgid "Currently used search engines" +msgstr "Erabiliak izaten ari diren bilatzaileak" + +#: searx/templates/courgette/preferences.html:100 +#: searx/templates/legacy/preferences.html:97 +#: searx/templates/oscar/preferences.html:162 +#: searx/templates/oscar/preferences.html:176 +#: searx/templates/pix-art/preferences.html:53 +#: searx/templates/simple/preferences.html:87 +msgid "Engine name" +msgstr "Bilatzailearen izena" + +#: searx/templates/courgette/preferences.html:101 +#: searx/templates/legacy/preferences.html:98 +msgid "Category" +msgstr "Kategoria" + +#: searx/templates/courgette/preferences.html:102 +#: searx/templates/courgette/preferences.html:113 +#: searx/templates/legacy/preferences.html:99 +#: searx/templates/legacy/preferences.html:110 +#: searx/templates/oscar/preferences.html:161 +#: searx/templates/oscar/preferences.html:177 +#: searx/templates/pix-art/preferences.html:54 +#: searx/templates/pix-art/preferences.html:64 +#: searx/templates/simple/preferences.html:86 +msgid "Allow" +msgstr "Baimendu" + +#: searx/templates/courgette/preferences.html:102 +#: searx/templates/courgette/preferences.html:114 +#: searx/templates/legacy/preferences.html:99 +#: searx/templates/legacy/preferences.html:111 +#: searx/templates/pix-art/preferences.html:54 +#: searx/templates/pix-art/preferences.html:65 +msgid "Block" +msgstr "Blokeatu" + +#: searx/templates/courgette/preferences.html:122 +#: searx/templates/legacy/preferences.html:119 +#: searx/templates/oscar/preferences.html:297 +#: searx/templates/pix-art/preferences.html:73 +#: searx/templates/simple/preferences.html:180 +msgid "" +"These settings are stored in your cookies, this allows us not to store this " +"data about you." +msgstr "Ezarpen hauek zure cookietan gurdetzen dira, honek zuri buruzko informaziorik ez gordetzea baimentzen digu." + +#: searx/templates/courgette/preferences.html:124 +#: searx/templates/legacy/preferences.html:121 +#: searx/templates/oscar/preferences.html:299 +#: searx/templates/pix-art/preferences.html:75 +#: searx/templates/simple/preferences.html:182 +msgid "" +"These cookies serve your sole convenience, we don't use these cookies to " +"track you." +msgstr "Cookie hauek zure onurarako besterik ez dira, ez ditugu zure jarraipenik egiteko erabiltzen." + +#: searx/templates/courgette/preferences.html:127 +#: searx/templates/legacy/preferences.html:124 +#: searx/templates/oscar/preferences.html:305 +#: searx/templates/pix-art/preferences.html:78 +#: searx/templates/simple/preferences.html:185 +msgid "save" +msgstr "gorde" + +#: searx/templates/courgette/preferences.html:128 +#: searx/templates/legacy/preferences.html:125 +#: searx/templates/oscar/preferences.html:307 +#: searx/templates/simple/preferences.html:186 +msgid "Reset defaults" +msgstr "Berrezarri lehenetsiak" + +#: searx/templates/courgette/preferences.html:129 +#: searx/templates/legacy/preferences.html:126 +#: searx/templates/oscar/preferences.html:306 +#: searx/templates/pix-art/preferences.html:79 +#: searx/templates/simple/preferences.html:187 +msgid "back" +msgstr "atzera" + +#: searx/templates/courgette/results.html:12 +#: searx/templates/legacy/results.html:13 +#: searx/templates/oscar/results.html:136 +#: searx/templates/simple/results.html:58 +msgid "Search URL" +msgstr "Bilaketa URLa" + +#: searx/templates/courgette/results.html:16 +#: searx/templates/legacy/results.html:17 +#: searx/templates/oscar/results.html:141 +#: searx/templates/simple/results.html:62 +msgid "Download results" +msgstr "Emaitzak deskargatu" + +#: searx/templates/courgette/results.html:34 +#: searx/templates/legacy/results.html:35 +#: searx/templates/simple/results.html:10 +msgid "Answers" +msgstr "Erantzunak" + +#: searx/templates/courgette/results.html:42 +#: searx/templates/legacy/results.html:43 +#: searx/templates/oscar/results.html:116 +#: searx/templates/simple/results.html:42 +msgid "Suggestions" +msgstr "Iradokizunak" + +#: searx/templates/courgette/results.html:70 +#: searx/templates/legacy/results.html:81 +#: searx/templates/oscar/results.html:68 searx/templates/oscar/results.html:78 +#: searx/templates/simple/results.html:130 +msgid "previous page" +msgstr "aurreko orrialdea" + +#: searx/templates/courgette/results.html:81 +#: searx/templates/legacy/results.html:92 +#: searx/templates/oscar/results.html:62 searx/templates/oscar/results.html:84 +#: searx/templates/simple/results.html:145 +msgid "next page" +msgstr "hurrengo orrialdea" + +#: searx/templates/courgette/search.html:3 +#: searx/templates/legacy/search.html:3 searx/templates/oscar/search.html:6 +#: searx/templates/oscar/search_full.html:9 +#: searx/templates/pix-art/search.html:3 searx/templates/simple/search.html:4 +msgid "Search for..." +msgstr "Bilatu..." + +#: searx/templates/courgette/stats.html:4 searx/templates/legacy/stats.html:4 +#: searx/templates/oscar/stats.html:5 searx/templates/pix-art/stats.html:4 +#: searx/templates/simple/stats.html:7 +msgid "Engine stats" +msgstr "Bilatzaileen estatistikak" + +#: searx/templates/courgette/result_templates/images.html:4 +#: searx/templates/legacy/result_templates/images.html:4 +#: searx/templates/pix-art/result_templates/images.html:4 +msgid "original context" +msgstr "jatorrizko testuingurua" + +#: searx/templates/courgette/result_templates/torrent.html:7 +#: searx/templates/legacy/result_templates/torrent.html:11 +#: searx/templates/oscar/result_templates/torrent.html:6 +#: searx/templates/simple/result_templates/torrent.html:9 +msgid "Seeder" +msgstr "Ereilea" + +#: searx/templates/courgette/result_templates/torrent.html:7 +#: searx/templates/legacy/result_templates/torrent.html:11 +#: searx/templates/oscar/result_templates/torrent.html:6 +#: searx/templates/simple/result_templates/torrent.html:9 +msgid "Leecher" +msgstr "Izaina" + +#: searx/templates/courgette/result_templates/torrent.html:9 +#: searx/templates/legacy/result_templates/torrent.html:9 +#: searx/templates/oscar/macros.html:23 +#: searx/templates/simple/result_templates/torrent.html:6 +msgid "magnet link" +msgstr "magnet lotura" + +#: searx/templates/courgette/result_templates/torrent.html:10 +#: searx/templates/legacy/result_templates/torrent.html:10 +#: searx/templates/oscar/macros.html:24 +#: searx/templates/simple/result_templates/torrent.html:7 +msgid "torrent file" +msgstr "torrent fitxategia" + +#: searx/templates/legacy/categories.html:8 +#: searx/templates/simple/categories.html:6 +msgid "Click on the magnifier to perform search" +msgstr "Lupan sakatu bilaketa egiteko" + +#: searx/templates/legacy/preferences.html:84 +#: searx/templates/oscar/preferences.html:113 +#: searx/templates/simple/preferences.html:142 +msgid "Results on new tabs" +msgstr "Emaitzak fitxa berrietan" + +#: searx/templates/legacy/preferences.html:87 +#: searx/templates/oscar/preferences.html:117 +#: searx/templates/simple/preferences.html:145 +msgid "On" +msgstr "Piztuta" + +#: searx/templates/legacy/preferences.html:88 +#: searx/templates/oscar/preferences.html:118 +#: searx/templates/simple/preferences.html:146 +msgid "Off" +msgstr "Itzalita" + +#: searx/templates/legacy/result_templates/code.html:3 +#: searx/templates/legacy/result_templates/default.html:3 +#: searx/templates/legacy/result_templates/map.html:9 +#: searx/templates/oscar/macros.html:34 searx/templates/oscar/macros.html:48 +#: searx/templates/simple/macros.html:43 +msgid "cached" +msgstr "cacheatuta" + +#: searx/templates/oscar/advanced.html:4 +msgid "Advanced settings" +msgstr "Ezarpen aurreratuak" + +#: searx/templates/oscar/base.html:62 +#: searx/templates/oscar/messages/first_time.html:4 +#: searx/templates/oscar/messages/save_settings_successfull.html:5 +#: searx/templates/oscar/messages/unknow_error.html:5 +msgid "Close" +msgstr "Itxi" + +#: searx/templates/oscar/base.html:64 +#: searx/templates/oscar/messages/no_results.html:4 +#: searx/templates/simple/messages/no_results.html:4 +#: searx/templates/simple/results.html:25 +msgid "Error!" +msgstr "Errorea!" + +#: searx/templates/oscar/base.html:90 searx/templates/simple/base.html:55 +msgid "Powered by" +msgstr "Honek bultzatua" + +#: searx/templates/oscar/base.html:90 searx/templates/simple/base.html:55 +msgid "a privacy-respecting, hackable metasearch engine" +msgstr "pribatutasun-errespetatzaile, metabilaketa motor hackeagarri bat" + +#: searx/templates/oscar/macros.html:36 searx/templates/oscar/macros.html:50 +#: searx/templates/simple/macros.html:43 +msgid "proxied" +msgstr "proxyatuta" + +#: searx/templates/oscar/macros.html:92 +msgid "supported" +msgstr "onartua" + +#: searx/templates/oscar/macros.html:96 +msgid "not supported" +msgstr "ez onartua" + +#: searx/templates/oscar/preferences.html:13 +#: searx/templates/oscar/preferences.html:22 +#: searx/templates/simple/preferences.html:32 +msgid "General" +msgstr "Orokorra" + +#: searx/templates/oscar/preferences.html:14 +#: searx/templates/oscar/preferences.html:146 +#: searx/templates/simple/preferences.html:76 +msgid "Engines" +msgstr "Bilatzaileak" + +#: searx/templates/oscar/preferences.html:15 +#: searx/templates/oscar/preferences.html:219 +msgid "Plugins" +msgstr "Pluginak" + +#: searx/templates/oscar/preferences.html:16 +#: searx/templates/oscar/preferences.html:245 +msgid "Answerers" +msgstr "Erantzun emaileak" + +#: searx/templates/oscar/preferences.html:17 +#: searx/templates/oscar/preferences.html:272 +msgid "Cookies" +msgstr "Cookieak" + +#: searx/templates/oscar/preferences.html:42 +#: searx/templates/simple/preferences.html:48 +msgid "What language do you prefer for search?" +msgstr "Zein hizkuntzan egin nahi duzu bilaketa?" + +#: searx/templates/oscar/preferences.html:48 +#: searx/templates/simple/preferences.html:128 +msgid "Change the language of the layout" +msgstr "Interfazearen hizkuntza aldatu" + +#: searx/templates/oscar/preferences.html:58 +#: searx/templates/simple/preferences.html:60 +msgid "Find stuff as you type" +msgstr "Gauzak aurkitu idatzi bitartean" + +#: searx/templates/oscar/preferences.html:69 +#: searx/templates/simple/preferences.html:173 +msgid "Proxying image results through searx" +msgstr "Irudien emaitzak searx bitartez proxyatu" + +#: searx/templates/oscar/preferences.html:78 +msgid "" +"Change how forms are submited, <a " +"href=\"http://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods\"" +" rel=\"external\">learn more about request methods</a>" +msgstr "Aldatu inprimakiak nola bidaltzen diren, <a href=\"http://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods\" rel=\"external\">ikasi gehiago eskaera metodoen inguruan</a>" + +#: searx/templates/oscar/preferences.html:87 +#: searx/templates/simple/preferences.html:71 +msgid "Filter content" +msgstr "Edukia iragazi" + +#: searx/templates/oscar/preferences.html:97 +#: searx/templates/simple/preferences.html:139 +msgid "Change searx layout" +msgstr "Searxen diseinua aldatu" + +#: searx/templates/oscar/preferences.html:106 +#: searx/templates/oscar/preferences.html:111 +msgid "Choose style for this theme" +msgstr "Gai honetarako estiloa hautatu" + +#: searx/templates/oscar/preferences.html:106 +#: searx/templates/oscar/preferences.html:111 +msgid "Style" +msgstr "Estiloa" + +#: searx/templates/oscar/preferences.html:122 +msgid "Open Access DOI resolver" +msgstr "Open Access DOI ebatzi" + +#: searx/templates/oscar/preferences.html:123 +msgid "" +"Redirect to open-access versions of publications when available (plugin " +"required)" +msgstr "Argitalpenen sartze-askeko bertsioetara berbidali ahal denean (plugina behar du)" + +#: searx/templates/oscar/preferences.html:163 +#: searx/templates/oscar/preferences.html:175 +#: searx/templates/simple/preferences.html:88 +msgid "Shortcut" +msgstr "Lasterbidea" + +#: searx/templates/oscar/preferences.html:164 +#: searx/templates/oscar/preferences.html:174 +msgid "Selected language" +msgstr "Hautatutako hizkuntza" + +#: searx/templates/oscar/preferences.html:166 +#: searx/templates/oscar/preferences.html:172 +#: searx/templates/simple/preferences.html:91 +msgid "Time range" +msgstr "Denbora tartea" + +#: searx/templates/oscar/preferences.html:167 +#: searx/templates/oscar/preferences.html:171 +#: searx/templates/simple/preferences.html:92 +msgid "Avg. time" +msgstr " Batezbesteko denbora" + +#: searx/templates/oscar/preferences.html:168 +#: searx/templates/oscar/preferences.html:170 +#: searx/templates/simple/preferences.html:93 +msgid "Max time" +msgstr "Gehienezko denbora" + +#: searx/templates/oscar/preferences.html:248 +msgid "This is the list of searx's instant answering modules." +msgstr "Hau da searxen berehalako erantzunen moduluen zerrenda." + +#: searx/templates/oscar/preferences.html:252 +msgid "Name" +msgstr "Izena" + +#: searx/templates/oscar/preferences.html:253 +msgid "Keywords" +msgstr "Gako-hitzak" + +#: searx/templates/oscar/preferences.html:254 +msgid "Description" +msgstr "Deskripzioa" + +#: searx/templates/oscar/preferences.html:255 +msgid "Examples" +msgstr "Adibideak" + +#: searx/templates/oscar/preferences.html:275 +msgid "" +"This is the list of cookies and their values searx is storing on your " +"computer." +msgstr "Hau searxek zure ordenagailuan gordetzen ari den cookien eta haien balioen zerrenda bat da." + +#: searx/templates/oscar/preferences.html:276 +msgid "With that list, you can assess searx transparency." +msgstr "Zerrenda horrekin, searxen gardentasuna balioztatu dezakezu." + +#: searx/templates/oscar/preferences.html:281 +msgid "Cookie name" +msgstr "Cookiearen izena" + +#: searx/templates/oscar/preferences.html:282 +msgid "Value" +msgstr "Balioa" + +#: searx/templates/oscar/preferences.html:301 +msgid "Search URL of the currently saved preferences" +msgstr "Une honetan gordetako hobespenen bilaketa URLa" + +#: searx/templates/oscar/preferences.html:301 +msgid "" +"Note: specifying custom settings in the search URL can reduce privacy by " +"leaking data to the clicked result sites." +msgstr "Oharra: bilaketa URLan ezarpen pertsonalizatuak zehazteak pribatutasuna txikiagotu dezake klikatutako erantzun guneetara datuak emanez" + +#: searx/templates/oscar/results.html:17 +msgid "Search results" +msgstr "Bilaketaren emaitzak" + +#: searx/templates/oscar/results.html:21 +#: searx/templates/simple/results.html:84 +msgid "Try searching for:" +msgstr "Saiatu hau bilatzen:" + +#: searx/templates/oscar/results.html:100 +#: searx/templates/simple/results.html:25 +msgid "Engines cannot retrieve results" +msgstr "Bilatzaileek ezin dute emaitzik lortu" + +#: searx/templates/oscar/results.html:131 +msgid "Links" +msgstr "Estekak" + +#: searx/templates/oscar/search.html:8 +#: searx/templates/oscar/search_full.html:11 +#: searx/templates/simple/search.html:5 +msgid "Start search" +msgstr "Bilaketa hasi" + +#: searx/templates/oscar/stats.html:2 +msgid "stats" +msgstr "estatistikak" + +#: searx/templates/oscar/time-range.html:3 +#: searx/templates/simple/time-range.html:3 +msgid "Anytime" +msgstr "Edonoiz" + +#: searx/templates/oscar/time-range.html:6 +#: searx/templates/simple/time-range.html:6 +msgid "Last day" +msgstr "Azken eguna" + +#: searx/templates/oscar/time-range.html:9 +#: searx/templates/simple/time-range.html:9 +msgid "Last week" +msgstr "Azken astea" + +#: searx/templates/oscar/time-range.html:12 +#: searx/templates/simple/time-range.html:12 +msgid "Last month" +msgstr "Azken hilabetea" + +#: searx/templates/oscar/time-range.html:15 +#: searx/templates/simple/time-range.html:15 +msgid "Last year" +msgstr "Azken urtea" + +#: searx/templates/oscar/messages/first_time.html:6 +#: searx/templates/oscar/messages/no_data_available.html:3 +msgid "Heads up!" +msgstr "Kasu!" + +#: searx/templates/oscar/messages/first_time.html:7 +msgid "It look like you are using searx first time." +msgstr "Searx lehen aldiz erabiltzen ari zarela ematen du." + +#: searx/templates/oscar/messages/no_cookies.html:3 +msgid "Information!" +msgstr "Informazioa!" + +#: searx/templates/oscar/messages/no_cookies.html:4 +msgid "currently, there are no cookies defined." +msgstr "une honetan, ez dago cookierik definitutik." + +#: searx/templates/oscar/messages/no_data_available.html:4 +msgid "There is currently no data available. " +msgstr "Une honetan ez dago daturik eskuragarri." + +#: searx/templates/oscar/messages/no_results.html:4 +#: searx/templates/simple/messages/no_results.html:4 +msgid "Engines cannot retrieve results." +msgstr "Bilatzaileek ezin dute emaitzik lortu." + +#: searx/templates/oscar/messages/no_results.html:10 +#: searx/templates/simple/messages/no_results.html:10 +msgid "Please, try again later or find another searx instance." +msgstr "Mesedez, saiatu berriz beranduago edo bila ezazu beste searx instantzia bat." + +#: searx/templates/oscar/messages/no_results.html:14 +#: searx/templates/simple/messages/no_results.html:14 +msgid "Sorry!" +msgstr "Barkatu!" + +#: searx/templates/oscar/messages/no_results.html:15 +#: searx/templates/simple/messages/no_results.html:15 +msgid "" +"we didn't find any results. Please use another query or search in more " +"categories." +msgstr "ez dugu emaitzik aurkitu. Mesedez beste kontsulta bat egin edo bilatu kategoria gehiagotan." + +#: searx/templates/oscar/messages/save_settings_successfull.html:7 +msgid "Well done!" +msgstr "Ondo egina!" + +#: searx/templates/oscar/messages/save_settings_successfull.html:8 +msgid "Settings saved successfully." +msgstr "Ezarpenak ongi gorde dira." + +#: searx/templates/oscar/messages/unknow_error.html:7 +msgid "Oh snap!" +msgstr "Hara!" + +#: searx/templates/oscar/messages/unknow_error.html:8 +msgid "Something went wrong." +msgstr "Zerbait gaizki joan da." + +#: searx/templates/oscar/result_templates/default.html:7 +#: searx/templates/simple/result_templates/default.html:6 +msgid "show media" +msgstr "media erakutsi" + +#: searx/templates/oscar/result_templates/default.html:7 +#: searx/templates/simple/result_templates/default.html:6 +msgid "hide media" +msgstr "media ezkutatu" + +#: searx/templates/oscar/result_templates/images.html:30 +msgid "Get image" +msgstr "Irudia eskuratu" + +#: searx/templates/oscar/result_templates/images.html:33 +msgid "View source" +msgstr "Iturria ikusi" + +#: searx/templates/oscar/result_templates/map.html:7 +#: searx/templates/simple/result_templates/map.html:7 +msgid "show map" +msgstr "mapa erakutsi" + +#: searx/templates/oscar/result_templates/map.html:7 +#: searx/templates/simple/result_templates/map.html:7 +msgid "hide map" +msgstr "mapa ezkutatu" + +#: searx/templates/oscar/result_templates/map.html:11 +#: searx/templates/simple/result_templates/map.html:11 +msgid "show details" +msgstr "xehetasunak erakutsi" + +#: searx/templates/oscar/result_templates/map.html:11 +#: searx/templates/simple/result_templates/map.html:11 +msgid "hide details" +msgstr "xehetasunak ezkutatu" + +#: searx/templates/oscar/result_templates/torrent.html:7 +#: searx/templates/simple/result_templates/torrent.html:11 +msgid "Filesize" +msgstr "Fitxategi neurria" + +#: searx/templates/oscar/result_templates/torrent.html:9 +#: searx/templates/simple/result_templates/torrent.html:12 +msgid "Bytes" +msgstr "Byteak" + +#: searx/templates/oscar/result_templates/torrent.html:10 +#: searx/templates/simple/result_templates/torrent.html:13 +msgid "kiB" +msgstr "kiB" + +#: searx/templates/oscar/result_templates/torrent.html:11 +#: searx/templates/simple/result_templates/torrent.html:14 +msgid "MiB" +msgstr "MiB" + +#: searx/templates/oscar/result_templates/torrent.html:12 +#: searx/templates/simple/result_templates/torrent.html:15 +msgid "GiB" +msgstr "GiB" + +#: searx/templates/oscar/result_templates/torrent.html:13 +#: searx/templates/simple/result_templates/torrent.html:16 +msgid "TiB" +msgstr "TiB" + +#: searx/templates/oscar/result_templates/torrent.html:15 +#: searx/templates/simple/result_templates/torrent.html:20 +msgid "Number of Files" +msgstr "Fitxategi kopurua" + +#: searx/templates/oscar/result_templates/videos.html:7 +#: searx/templates/simple/result_templates/videos.html:6 +msgid "show video" +msgstr "erakutsi bideoa" + +#: searx/templates/oscar/result_templates/videos.html:7 +#: searx/templates/simple/result_templates/videos.html:6 +msgid "hide video" +msgstr "ezkutatu bideoa" + +#: searx/templates/pix-art/results.html:28 +msgid "Load more..." +msgstr "Kargatu gehiago..." + +#: searx/templates/simple/base.html:31 +msgid "No item found" +msgstr "Ez da elementurik aurkitu" + +#: searx/templates/simple/preferences.html:89 +msgid "Supports selected language" +msgstr "Hautatutako hizkuntza onartzen du" + +#: searx/templates/simple/preferences.html:118 +msgid "User interface" +msgstr "Erabiltzailearen interfazea" + +#: searx/templates/simple/preferences.html:154 +msgid "Privacy" +msgstr "Pribatutasuna" diff --git a/searx/translations/fa_IR/LC_MESSAGES/messages.mo b/searx/translations/fa_IR/LC_MESSAGES/messages.mo new file mode 100644 index 0000000000..4ef71416b3 Binary files /dev/null and b/searx/translations/fa_IR/LC_MESSAGES/messages.mo differ diff --git a/searx/translations/fa_IR/LC_MESSAGES/messages.po b/searx/translations/fa_IR/LC_MESSAGES/messages.po new file mode 100644 index 0000000000..0e568e1db8 --- /dev/null +++ b/searx/translations/fa_IR/LC_MESSAGES/messages.po @@ -0,0 +1,1015 @@ +# Translations template for PROJECT. +# Copyright (C) 2017 ORGANIZATION +# This file is distributed under the same license as the PROJECT project. +# +# Translators: +# Aurora, 2018 +# Jim <inactive+Jim11@transifex.com>, 2017 +# Mostafa Ahangarha <ahangarha@gmail.com>, 2018 +msgid "" +msgstr "" +"Project-Id-Version: searx\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2017-11-01 21:31+0100\n" +"PO-Revision-Date: 2018-04-16 16:41+0000\n" +"Last-Translator: Aurora\n" +"Language-Team: Persian (Iran) (http://www.transifex.com/asciimoo/searx/language/fa_IR/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 2.3.4\n" +"Language: fa_IR\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#: searx/search.py:137 searx/search.py:182 +msgid "timeout" +msgstr "پایان زمان<br>" + +#: searx/search.py:144 +msgid "request exception" +msgstr "خطا در درخواست" + +#: searx/search.py:151 +msgid "unexpected crash" +msgstr "ایست ناگهانی" + +#: searx/webapp.py:136 +msgid "files" +msgstr "فایل ها<br>" + +#: searx/webapp.py:137 +msgid "general" +msgstr "فراگیر" + +#: searx/webapp.py:138 +msgid "music" +msgstr "موسیقی" + +#: searx/webapp.py:139 +msgid "social media" +msgstr "رسانه اجتماعی" + +#: searx/webapp.py:140 +msgid "images" +msgstr "تصاویر<br>" + +#: searx/webapp.py:141 +msgid "videos" +msgstr "ویدیو ها<br>" + +#: searx/webapp.py:142 +msgid "it" +msgstr "فناوری اطلاعات" + +#: searx/webapp.py:143 +msgid "news" +msgstr "اخبار" + +#: searx/webapp.py:144 +msgid "map" +msgstr "نقشه" + +#: searx/webapp.py:145 +msgid "science" +msgstr "دانش<br>" + +#: searx/webapp.py:399 searx/webapp.py:658 +msgid "Invalid settings, please edit your preferences" +msgstr "تنظیمات نادرست است، لطفا اولویت‌های جستجو را تغییر دهید" + +#: searx/webapp.py:415 +msgid "Invalid settings" +msgstr "تنظیمات اشتباه" + +#: searx/webapp.py:449 searx/webapp.py:493 +msgid "search error" +msgstr "خطای جستجو" + +#: searx/webapp.py:530 +msgid "{minutes} minute(s) ago" +msgstr "{minutes} دقیقه پیش" + +#: searx/webapp.py:532 +msgid "{hours} hour(s), {minutes} minute(s) ago" +msgstr "{hours} ساعت و {minutes} دقیقه پیش" + +#: searx/answerers/random/answerer.py:53 +msgid "Random value generator" +msgstr "ایجاد کننده ی مقدار تصادفی" + +#: searx/answerers/random/answerer.py:54 +msgid "Generate different random values" +msgstr "ایجاد مقادیر تصادفی متفاوت" + +#: searx/answerers/statistics/answerer.py:53 +msgid "Statistics functions" +msgstr "توابع آماری" + +#: searx/answerers/statistics/answerer.py:54 +msgid "Compute {functions} of the arguments" +msgstr "پردازش {عملکرد های} نشانوند ها<br>" + +#: searx/engines/__init__.py:194 searx/engines/flycheck___init__.py:201 +msgid "Engine time (sec)" +msgstr "زمان موتور(ثانیه)<br>" + +#: searx/engines/__init__.py:198 searx/engines/flycheck___init__.py:205 +msgid "Page loads (sec)" +msgstr "زمان بارگذاری صفحه (ثانیه)" + +#: searx/engines/__init__.py:202 searx/engines/flycheck___init__.py:209 +#: searx/templates/oscar/results.html:95 +#: searx/templates/simple/results.html:20 +msgid "Number of results" +msgstr "تعداد نتایج" + +#: searx/engines/__init__.py:206 searx/engines/flycheck___init__.py:213 +msgid "Scores" +msgstr "امتیازات<br>" + +#: searx/engines/__init__.py:210 searx/engines/flycheck___init__.py:217 +msgid "Scores per result" +msgstr "امتیازات بر نتیجه<br>" + +#: searx/engines/__init__.py:214 searx/engines/flycheck___init__.py:221 +msgid "Errors" +msgstr "خطاها" + +#: searx/engines/pdbe.py:87 +msgid "{title} (OBSOLETE)" +msgstr "{title} (OBSOLETE)" + +#: searx/engines/pdbe.py:91 +msgid "This entry has been superseded by" +msgstr "این ورودی معلق شده است توسط" + +#: searx/engines/pubmed.py:74 +msgid "No abstract is available for this publication." +msgstr "هیچ چکید ای برای این نشریه در دسترس نیست.<br>" + +#: searx/plugins/https_rewrite.py:32 +msgid "Rewrite HTTP links to HTTPS if possible" +msgstr "تغییر پیوند های HTTP به HTTPS در صورت امکان" + +#: searx/plugins/infinite_scroll.py:3 +msgid "Infinite scroll" +msgstr "پایین رفتن بی‌پایان" + +#: searx/plugins/infinite_scroll.py:4 +msgid "Automatically load next page when scrolling to bottom of current page" +msgstr "بارگذاری خودکار صفحه بعد در صورت پیمایش تا پایین صفحه کنونی" + +#: searx/plugins/oa_doi_rewrite.py:9 +msgid "Open Access DOI rewrite" +msgstr "بازنویسی Open Access DOI<br>" + +#: searx/plugins/oa_doi_rewrite.py:10 +msgid "" +"Avoid paywalls by redirecting to open-access versions of publications when " +"available" +msgstr "امتناع از منابع غیر رایگان با تغییر مسیر به نسخه ی رایگان نشریات اگر در دسترس باشد<br>" + +#: searx/plugins/open_results_on_new_tab.py:18 +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/simple/preferences.html:149 +msgid "Open result links on new browser tabs" +msgstr "باز کردن لینک های نتیجه در برگه‌ی جدید مرورگر" + +#: searx/plugins/open_results_on_new_tab.py:19 +msgid "" +"Results are opened in the same window by default. This plugin overwrites the" +" default behaviour to open links on new tabs/windows. (JavaScript required)" +msgstr "به طور پیش‌فرض، نتایج در پنجره ی کنونی باز می‌شوند. این افزونه، رفتار پیش‌فرض را برای بازشدن پیوند در پنجره/برگه جدید تغییر می‌دهد. (نیازمند جاوااسکریپت)" + +#: searx/plugins/search_on_category_select.py:18 +msgid "Search on category select" +msgstr "جستجو به محض انتخاب یک دسته<br>" + +#: searx/plugins/search_on_category_select.py:19 +msgid "" +"Perform search immediately if a category selected. Disable to select " +"multiple categories. (JavaScript required)" +msgstr "جستجو به محض انتخاب یک دسته. برای انتخاب چند دسته این گزینه را غیرفعال کنید. (نیازمند جاواسکریپت)<br>" + +#: searx/plugins/self_info.py:20 +msgid "" +"Displays your IP if the query is \"ip\" and your user agent if the query " +"contains \"user agent\"." +msgstr "اگر آی پی شما در صورت جستجو برای 'ip' و نشان دادن عامل کاربر در صورت جستجو برای 'user agent'.<br>" + +#: searx/plugins/tracker_url_remover.py:26 +msgid "Tracker URL remover" +msgstr "از بین برنده ی آدرس ردیاب ها<br>" + +#: searx/plugins/tracker_url_remover.py:27 +msgid "Remove trackers arguments from the returned URL" +msgstr "حذف نشانوند های ردیاب ها از آدرس برگشتی" + +#: searx/plugins/vim_hotkeys.py:3 +msgid "Vim-like hotkeys" +msgstr "کلیدهای میانبر شبیه Vim<br>" + +#: searx/plugins/vim_hotkeys.py:4 +msgid "" +"Navigate search results with Vim-like hotkeys (JavaScript required). Press " +"\"h\" key on main or result page to get help." +msgstr "جابجایی در نتایج با کلیدهای میان‌بر مشابه Vim (نیازمند جاوااسکریپت). در صفحه اصلی و یا صفحه نتیجه، دکمه h را برای نمایش راهنما بفشارید." + +#: searx/templates/courgette/404.html:4 searx/templates/legacy/404.html:4 +#: searx/templates/oscar/404.html:4 searx/templates/pix-art/404.html:4 +#: searx/templates/simple/404.html:4 +msgid "Page not found" +msgstr "صفحه پیدا نشد" + +#: searx/templates/courgette/404.html:6 searx/templates/legacy/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +#: searx/templates/simple/404.html:6 +#, python-format +msgid "Go to %(search_page)s." +msgstr "برو به%(search_page)s." + +#: searx/templates/courgette/404.html:6 searx/templates/legacy/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +#: searx/templates/simple/404.html:6 +msgid "search page" +msgstr "صفحه جستجو<br>" + +#: searx/templates/courgette/index.html:9 +#: searx/templates/courgette/index.html:13 +#: searx/templates/courgette/results.html:5 +#: searx/templates/legacy/index.html:8 searx/templates/legacy/index.html:12 +#: searx/templates/oscar/navbar.html:7 +#: searx/templates/oscar/preferences.html:3 +#: searx/templates/pix-art/index.html:8 +msgid "preferences" +msgstr "تنظیمات<br>" + +#: searx/templates/courgette/index.html:11 +#: searx/templates/legacy/index.html:10 searx/templates/oscar/about.html:2 +#: searx/templates/oscar/navbar.html:6 searx/templates/pix-art/index.html:7 +msgid "about" +msgstr "درباره<br>" + +#: searx/templates/courgette/preferences.html:5 +#: searx/templates/legacy/preferences.html:5 +#: searx/templates/oscar/preferences.html:8 +#: searx/templates/pix-art/preferences.html:5 +#: searx/templates/simple/preferences.html:26 +msgid "Preferences" +msgstr "تنظیمات<br>" + +#: searx/templates/courgette/preferences.html:9 +#: searx/templates/legacy/preferences.html:9 +#: searx/templates/oscar/preferences.html:33 +#: searx/templates/oscar/preferences.html:35 +#: searx/templates/simple/preferences.html:34 +msgid "Default categories" +msgstr "دسته‌بندی های پیش‌فرض" + +#: searx/templates/courgette/preferences.html:13 +#: searx/templates/legacy/preferences.html:14 +#: searx/templates/oscar/preferences.html:41 +#: searx/templates/pix-art/preferences.html:9 +#: searx/templates/simple/preferences.html:39 +#: searx/templates/simple/preferences.html:163 +msgid "Search language" +msgstr "زبان جستجو" + +#: searx/templates/courgette/preferences.html:16 +#: searx/templates/legacy/preferences.html:17 +#: searx/templates/oscar/languages.html:6 +#: searx/templates/pix-art/preferences.html:12 +#: searx/templates/simple/languages.html:2 +#: searx/templates/simple/preferences.html:42 +msgid "Default language" +msgstr "زبان پیش‌فرض" + +#: searx/templates/courgette/preferences.html:24 +#: searx/templates/legacy/preferences.html:25 +#: searx/templates/oscar/preferences.html:47 +#: searx/templates/pix-art/preferences.html:20 +#: searx/templates/simple/preferences.html:120 +msgid "Interface language" +msgstr "زبان رابط کاربری" + +#: searx/templates/courgette/preferences.html:34 +#: searx/templates/legacy/preferences.html:35 +#: searx/templates/oscar/preferences.html:57 +#: searx/templates/simple/preferences.html:51 +msgid "Autocomplete" +msgstr "تکمیل خودکار<br>" + +#: searx/templates/courgette/preferences.html:45 +#: searx/templates/legacy/preferences.html:46 +#: searx/templates/oscar/preferences.html:68 +#: searx/templates/simple/preferences.html:166 +msgid "Image proxy" +msgstr "پراکسی تصویر<br>" + +#: searx/templates/courgette/preferences.html:48 +#: searx/templates/legacy/preferences.html:49 +#: searx/templates/oscar/preferences.html:72 +#: searx/templates/simple/preferences.html:169 +msgid "Enabled" +msgstr "فعال<br>" + +#: searx/templates/courgette/preferences.html:49 +#: searx/templates/legacy/preferences.html:50 +#: searx/templates/oscar/preferences.html:73 +#: searx/templates/simple/preferences.html:170 +msgid "Disabled" +msgstr "غیرفعال" + +#: searx/templates/courgette/preferences.html:54 +#: searx/templates/legacy/preferences.html:55 +#: searx/templates/oscar/preferences.html:77 +#: searx/templates/pix-art/preferences.html:30 +#: searx/templates/simple/preferences.html:156 +msgid "Method" +msgstr "روش<br>" + +#: searx/templates/courgette/preferences.html:63 +#: searx/templates/legacy/preferences.html:64 +#: searx/templates/oscar/preferences.html:86 +#: searx/templates/oscar/preferences.html:165 +#: searx/templates/oscar/preferences.html:173 +#: searx/templates/simple/preferences.html:63 +#: searx/templates/simple/preferences.html:90 +msgid "SafeSearch" +msgstr "جستجوی امن" + +#: searx/templates/courgette/preferences.html:66 +#: searx/templates/legacy/preferences.html:67 +#: searx/templates/oscar/preferences.html:90 +#: searx/templates/simple/preferences.html:66 +msgid "Strict" +msgstr "سخت گیر<br>" + +#: searx/templates/courgette/preferences.html:67 +#: searx/templates/legacy/preferences.html:68 +#: searx/templates/oscar/preferences.html:91 +#: searx/templates/simple/preferences.html:67 +msgid "Moderate" +msgstr "متوسط<br>" + +#: searx/templates/courgette/preferences.html:68 +#: searx/templates/legacy/preferences.html:69 +#: searx/templates/oscar/preferences.html:92 +#: searx/templates/simple/preferences.html:68 +msgid "None" +msgstr "هیچ<br>" + +#: searx/templates/courgette/preferences.html:73 +#: searx/templates/legacy/preferences.html:74 +#: searx/templates/oscar/preferences.html:96 +#: searx/templates/pix-art/preferences.html:39 +#: searx/templates/simple/preferences.html:131 +msgid "Themes" +msgstr "تم ها<br>" + +#: searx/templates/courgette/preferences.html:83 +msgid "Color" +msgstr "رنگ" + +#: searx/templates/courgette/preferences.html:86 +msgid "Blue (default)" +msgstr "آبی (پیش‌فرض)" + +#: searx/templates/courgette/preferences.html:87 +msgid "Violet" +msgstr "بنفش" + +#: searx/templates/courgette/preferences.html:88 +msgid "Green" +msgstr "سبز<br>" + +#: searx/templates/courgette/preferences.html:89 +msgid "Cyan" +msgstr "فیروزه‌ای" + +#: searx/templates/courgette/preferences.html:90 +msgid "Orange" +msgstr "نارنجی" + +#: searx/templates/courgette/preferences.html:91 +msgid "Red" +msgstr "قرمز" + +#: searx/templates/courgette/preferences.html:96 +#: searx/templates/legacy/preferences.html:93 +#: searx/templates/pix-art/preferences.html:49 +#: searx/templates/simple/preferences.html:77 +msgid "Currently used search engines" +msgstr "موتورهای جستجوی در حال استفاده" + +#: searx/templates/courgette/preferences.html:100 +#: searx/templates/legacy/preferences.html:97 +#: searx/templates/oscar/preferences.html:162 +#: searx/templates/oscar/preferences.html:176 +#: searx/templates/pix-art/preferences.html:53 +#: searx/templates/simple/preferences.html:87 +msgid "Engine name" +msgstr "نام موتور" + +#: searx/templates/courgette/preferences.html:101 +#: searx/templates/legacy/preferences.html:98 +msgid "Category" +msgstr "دسته" + +#: searx/templates/courgette/preferences.html:102 +#: searx/templates/courgette/preferences.html:113 +#: searx/templates/legacy/preferences.html:99 +#: searx/templates/legacy/preferences.html:110 +#: searx/templates/oscar/preferences.html:161 +#: searx/templates/oscar/preferences.html:177 +#: searx/templates/pix-art/preferences.html:54 +#: searx/templates/pix-art/preferences.html:64 +#: searx/templates/simple/preferences.html:86 +msgid "Allow" +msgstr "اجازه" + +#: searx/templates/courgette/preferences.html:102 +#: searx/templates/courgette/preferences.html:114 +#: searx/templates/legacy/preferences.html:99 +#: searx/templates/legacy/preferences.html:111 +#: searx/templates/pix-art/preferences.html:54 +#: searx/templates/pix-art/preferences.html:65 +msgid "Block" +msgstr "انسداد<br>" + +#: searx/templates/courgette/preferences.html:122 +#: searx/templates/legacy/preferences.html:119 +#: searx/templates/oscar/preferences.html:297 +#: searx/templates/pix-art/preferences.html:73 +#: searx/templates/simple/preferences.html:180 +msgid "" +"These settings are stored in your cookies, this allows us not to store this " +"data about you." +msgstr "این تنظیمات در کوکی های شما ذخیره شده اند، این به ما اجازه می دهد این اطلاعات را درباره شما ذخیره نکنیم.<br>" + +#: searx/templates/courgette/preferences.html:124 +#: searx/templates/legacy/preferences.html:121 +#: searx/templates/oscar/preferences.html:299 +#: searx/templates/pix-art/preferences.html:75 +#: searx/templates/simple/preferences.html:182 +msgid "" +"These cookies serve your sole convenience, we don't use these cookies to " +"track you." +msgstr "این کوکی ها برای راحتی شماست، ما از این کوکی برای ردیابی شما استفاده نمیکنیم.<br>" + +#: searx/templates/courgette/preferences.html:127 +#: searx/templates/legacy/preferences.html:124 +#: searx/templates/oscar/preferences.html:305 +#: searx/templates/pix-art/preferences.html:78 +#: searx/templates/simple/preferences.html:185 +msgid "save" +msgstr "ذخیره" + +#: searx/templates/courgette/preferences.html:128 +#: searx/templates/legacy/preferences.html:125 +#: searx/templates/oscar/preferences.html:307 +#: searx/templates/simple/preferences.html:186 +msgid "Reset defaults" +msgstr "بازنشانی پیشفرض ها<br>" + +#: searx/templates/courgette/preferences.html:129 +#: searx/templates/legacy/preferences.html:126 +#: searx/templates/oscar/preferences.html:306 +#: searx/templates/pix-art/preferences.html:79 +#: searx/templates/simple/preferences.html:187 +msgid "back" +msgstr "عقب<br>" + +#: searx/templates/courgette/results.html:12 +#: searx/templates/legacy/results.html:13 +#: searx/templates/oscar/results.html:136 +#: searx/templates/simple/results.html:58 +msgid "Search URL" +msgstr "آدرس جستجو<br>" + +#: searx/templates/courgette/results.html:16 +#: searx/templates/legacy/results.html:17 +#: searx/templates/oscar/results.html:141 +#: searx/templates/simple/results.html:62 +msgid "Download results" +msgstr "نتایج دانلود<br>" + +#: searx/templates/courgette/results.html:34 +#: searx/templates/legacy/results.html:35 +#: searx/templates/simple/results.html:10 +msgid "Answers" +msgstr "پاسخ ها<br>" + +#: searx/templates/courgette/results.html:42 +#: searx/templates/legacy/results.html:43 +#: searx/templates/oscar/results.html:116 +#: searx/templates/simple/results.html:42 +msgid "Suggestions" +msgstr "پیشنهادات" + +#: searx/templates/courgette/results.html:70 +#: searx/templates/legacy/results.html:81 +#: searx/templates/oscar/results.html:68 searx/templates/oscar/results.html:78 +#: searx/templates/simple/results.html:130 +msgid "previous page" +msgstr "صفحه پیش" + +#: searx/templates/courgette/results.html:81 +#: searx/templates/legacy/results.html:92 +#: searx/templates/oscar/results.html:62 searx/templates/oscar/results.html:84 +#: searx/templates/simple/results.html:145 +msgid "next page" +msgstr "صفحه بعد" + +#: searx/templates/courgette/search.html:3 +#: searx/templates/legacy/search.html:3 searx/templates/oscar/search.html:6 +#: searx/templates/oscar/search_full.html:9 +#: searx/templates/pix-art/search.html:3 searx/templates/simple/search.html:4 +msgid "Search for..." +msgstr "جستجو برای …" + +#: searx/templates/courgette/stats.html:4 searx/templates/legacy/stats.html:4 +#: searx/templates/oscar/stats.html:5 searx/templates/pix-art/stats.html:4 +#: searx/templates/simple/stats.html:7 +msgid "Engine stats" +msgstr "آمار موتور<br>" + +#: searx/templates/courgette/result_templates/images.html:4 +#: searx/templates/legacy/result_templates/images.html:4 +#: searx/templates/pix-art/result_templates/images.html:4 +msgid "original context" +msgstr "متن اصلی<br>" + +#: searx/templates/courgette/result_templates/torrent.html:7 +#: searx/templates/legacy/result_templates/torrent.html:11 +#: searx/templates/oscar/result_templates/torrent.html:6 +#: searx/templates/simple/result_templates/torrent.html:9 +msgid "Seeder" +msgstr "سیدر<br>" + +#: searx/templates/courgette/result_templates/torrent.html:7 +#: searx/templates/legacy/result_templates/torrent.html:11 +#: searx/templates/oscar/result_templates/torrent.html:6 +#: searx/templates/simple/result_templates/torrent.html:9 +msgid "Leecher" +msgstr "لیچر<br>" + +#: searx/templates/courgette/result_templates/torrent.html:9 +#: searx/templates/legacy/result_templates/torrent.html:9 +#: searx/templates/oscar/macros.html:23 +#: searx/templates/simple/result_templates/torrent.html:6 +msgid "magnet link" +msgstr "لینک مگنت<br>" + +#: searx/templates/courgette/result_templates/torrent.html:10 +#: searx/templates/legacy/result_templates/torrent.html:10 +#: searx/templates/oscar/macros.html:24 +#: searx/templates/simple/result_templates/torrent.html:7 +msgid "torrent file" +msgstr "فایل تورنت<br>" + +#: searx/templates/legacy/categories.html:8 +#: searx/templates/simple/categories.html:6 +msgid "Click on the magnifier to perform search" +msgstr "برای اجرای جستجو روی ذره بین کلیک کنید<br>" + +#: searx/templates/legacy/preferences.html:84 +#: searx/templates/oscar/preferences.html:113 +#: searx/templates/simple/preferences.html:142 +msgid "Results on new tabs" +msgstr "نتایج در برگه جدید" + +#: searx/templates/legacy/preferences.html:87 +#: searx/templates/oscar/preferences.html:117 +#: searx/templates/simple/preferences.html:145 +msgid "On" +msgstr "روشن<br>" + +#: searx/templates/legacy/preferences.html:88 +#: searx/templates/oscar/preferences.html:118 +#: searx/templates/simple/preferences.html:146 +msgid "Off" +msgstr "خاموش<br>" + +#: searx/templates/legacy/result_templates/code.html:3 +#: searx/templates/legacy/result_templates/default.html:3 +#: searx/templates/legacy/result_templates/map.html:9 +#: searx/templates/oscar/macros.html:34 searx/templates/oscar/macros.html:48 +#: searx/templates/simple/macros.html:43 +msgid "cached" +msgstr "ذخیره شده<br>" + +#: searx/templates/oscar/advanced.html:4 +msgid "Advanced settings" +msgstr "تنظیمات پیشرفته<br>" + +#: searx/templates/oscar/base.html:62 +#: searx/templates/oscar/messages/first_time.html:4 +#: searx/templates/oscar/messages/save_settings_successfull.html:5 +#: searx/templates/oscar/messages/unknow_error.html:5 +msgid "Close" +msgstr "بستن<br>" + +#: searx/templates/oscar/base.html:64 +#: searx/templates/oscar/messages/no_results.html:4 +#: searx/templates/simple/messages/no_results.html:4 +#: searx/templates/simple/results.html:25 +msgid "Error!" +msgstr "خطا!<br>" + +#: searx/templates/oscar/base.html:90 searx/templates/simple/base.html:55 +msgid "Powered by" +msgstr "قدرت گرفته از<br>" + +#: searx/templates/oscar/base.html:90 searx/templates/simple/base.html:55 +msgid "a privacy-respecting, hackable metasearch engine" +msgstr "یک ابر موتور جستجوی حافظ حریم شخصی" + +#: searx/templates/oscar/macros.html:36 searx/templates/oscar/macros.html:50 +#: searx/templates/simple/macros.html:43 +msgid "proxied" +msgstr "پراکسی شده<br>" + +#: searx/templates/oscar/macros.html:92 +msgid "supported" +msgstr "پشتیبانی شده<br>" + +#: searx/templates/oscar/macros.html:96 +msgid "not supported" +msgstr "پشتیبانی نشده<br>" + +#: searx/templates/oscar/preferences.html:13 +#: searx/templates/oscar/preferences.html:22 +#: searx/templates/simple/preferences.html:32 +msgid "General" +msgstr "کلی<br>" + +#: searx/templates/oscar/preferences.html:14 +#: searx/templates/oscar/preferences.html:146 +#: searx/templates/simple/preferences.html:76 +msgid "Engines" +msgstr "موتور ها<br>" + +#: searx/templates/oscar/preferences.html:15 +#: searx/templates/oscar/preferences.html:219 +msgid "Plugins" +msgstr "افزونه ها" + +#: searx/templates/oscar/preferences.html:16 +#: searx/templates/oscar/preferences.html:245 +msgid "Answerers" +msgstr "پاسخگو ها<br>" + +#: searx/templates/oscar/preferences.html:17 +#: searx/templates/oscar/preferences.html:272 +msgid "Cookies" +msgstr "کوکی ها<br>" + +#: searx/templates/oscar/preferences.html:42 +#: searx/templates/simple/preferences.html:48 +msgid "What language do you prefer for search?" +msgstr "چه زبانی را برای جستجو ترجیح می‌دهید؟" + +#: searx/templates/oscar/preferences.html:48 +#: searx/templates/simple/preferences.html:128 +msgid "Change the language of the layout" +msgstr "تغییر زبان رابط کاربری" + +#: searx/templates/oscar/preferences.html:58 +#: searx/templates/simple/preferences.html:60 +msgid "Find stuff as you type" +msgstr "یافتن مطالب حین نوشتن" + +#: searx/templates/oscar/preferences.html:69 +#: searx/templates/simple/preferences.html:173 +msgid "Proxying image results through searx" +msgstr "پراکسی کردن نتایج تصویری از طریق searx<br>" + +#: searx/templates/oscar/preferences.html:78 +msgid "" +"Change how forms are submited, <a " +"href=\"http://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods\"" +" rel=\"external\">learn more about request methods</a>" +msgstr "چگونگی ثبت فرم ها را تغییر دهید، درباره ی متود های درخواست بیشتر بدانید" + +#: searx/templates/oscar/preferences.html:87 +#: searx/templates/simple/preferences.html:71 +msgid "Filter content" +msgstr "فیلتر کردن محتوا" + +#: searx/templates/oscar/preferences.html:97 +#: searx/templates/simple/preferences.html:139 +msgid "Change searx layout" +msgstr "رابط کاربری searx را تغییر دهید<br>" + +#: searx/templates/oscar/preferences.html:106 +#: searx/templates/oscar/preferences.html:111 +msgid "Choose style for this theme" +msgstr "سبک این پوسته را انتخاب کنید" + +#: searx/templates/oscar/preferences.html:106 +#: searx/templates/oscar/preferences.html:111 +msgid "Style" +msgstr "سبک" + +#: searx/templates/oscar/preferences.html:122 +msgid "Open Access DOI resolver" +msgstr "حل کننده ی Open Access DOI<br>" + +#: searx/templates/oscar/preferences.html:123 +msgid "" +"Redirect to open-access versions of publications when available (plugin " +"required)" +msgstr "هدایت به نسخه رایگان نشریات اگر در دسترس باشد(نیازمند به افزونه)<br>" + +#: searx/templates/oscar/preferences.html:163 +#: searx/templates/oscar/preferences.html:175 +#: searx/templates/simple/preferences.html:88 +msgid "Shortcut" +msgstr "میانبر<br>" + +#: searx/templates/oscar/preferences.html:164 +#: searx/templates/oscar/preferences.html:174 +msgid "Selected language" +msgstr "زبان انتخابی<br>" + +#: searx/templates/oscar/preferences.html:166 +#: searx/templates/oscar/preferences.html:172 +#: searx/templates/simple/preferences.html:91 +msgid "Time range" +msgstr "بازه ی زمانی<br>" + +#: searx/templates/oscar/preferences.html:167 +#: searx/templates/oscar/preferences.html:171 +#: searx/templates/simple/preferences.html:92 +msgid "Avg. time" +msgstr "زمان میانگین" + +#: searx/templates/oscar/preferences.html:168 +#: searx/templates/oscar/preferences.html:170 +#: searx/templates/simple/preferences.html:93 +msgid "Max time" +msgstr "حداکثر زمان" + +#: searx/templates/oscar/preferences.html:248 +msgid "This is the list of searx's instant answering modules." +msgstr "این، فهرست ماژول‌های پاسخ بلادرنگ searx است." + +#: searx/templates/oscar/preferences.html:252 +msgid "Name" +msgstr "نام" + +#: searx/templates/oscar/preferences.html:253 +msgid "Keywords" +msgstr "کلیدواژه ها<br>" + +#: searx/templates/oscar/preferences.html:254 +msgid "Description" +msgstr "شرح<br>" + +#: searx/templates/oscar/preferences.html:255 +msgid "Examples" +msgstr "مثال ها<br>" + +#: searx/templates/oscar/preferences.html:275 +msgid "" +"This is the list of cookies and their values searx is storing on your " +"computer." +msgstr "این، لیست کوکی‌ها و مقادیری است که searx روی دستگاه شما ذخیره می‌کند." + +#: searx/templates/oscar/preferences.html:276 +msgid "With that list, you can assess searx transparency." +msgstr "با آن لیست، می‌توانید شفافیت searx را ارزیابی کنید." + +#: searx/templates/oscar/preferences.html:281 +msgid "Cookie name" +msgstr "نام کوکی<br>" + +#: searx/templates/oscar/preferences.html:282 +msgid "Value" +msgstr "مقدار<br>" + +#: searx/templates/oscar/preferences.html:301 +msgid "Search URL of the currently saved preferences" +msgstr "آدرس جستجو بر اساس تنظیمات ذخیره شده<br>" + +#: searx/templates/oscar/preferences.html:301 +msgid "" +"Note: specifying custom settings in the search URL can reduce privacy by " +"leaking data to the clicked result sites." +msgstr "هشدار: تعیین تنظیمات شخصی در آدرس جستجو میتواند حریم شخصی شما را به خطر بیاندازد با درز کردن اطلاعات به سایت های نتایج انتخاب شده.<br>" + +#: searx/templates/oscar/results.html:17 +msgid "Search results" +msgstr "نتایج جستجو<br>" + +#: searx/templates/oscar/results.html:21 +#: searx/templates/simple/results.html:84 +msgid "Try searching for:" +msgstr "تلاش کنید برای جستجوی:" + +#: searx/templates/oscar/results.html:100 +#: searx/templates/simple/results.html:25 +msgid "Engines cannot retrieve results" +msgstr "موتور ها قادر به دریافت نتایج نیستند<br>" + +#: searx/templates/oscar/results.html:131 +msgid "Links" +msgstr "لینک ها<br>" + +#: searx/templates/oscar/search.html:8 +#: searx/templates/oscar/search_full.html:11 +#: searx/templates/simple/search.html:5 +msgid "Start search" +msgstr "شروع جستجو<br>" + +#: searx/templates/oscar/stats.html:2 +msgid "stats" +msgstr "آمار<br>" + +#: searx/templates/oscar/time-range.html:3 +#: searx/templates/simple/time-range.html:3 +msgid "Anytime" +msgstr "هر زمانی<br>" + +#: searx/templates/oscar/time-range.html:6 +#: searx/templates/simple/time-range.html:6 +msgid "Last day" +msgstr "روز گذشته" + +#: searx/templates/oscar/time-range.html:9 +#: searx/templates/simple/time-range.html:9 +msgid "Last week" +msgstr "هفته گذشته" + +#: searx/templates/oscar/time-range.html:12 +#: searx/templates/simple/time-range.html:12 +msgid "Last month" +msgstr "ماه گذشته" + +#: searx/templates/oscar/time-range.html:15 +#: searx/templates/simple/time-range.html:15 +msgid "Last year" +msgstr "سال گذشته" + +#: searx/templates/oscar/messages/first_time.html:6 +#: searx/templates/oscar/messages/no_data_available.html:3 +msgid "Heads up!" +msgstr "بالاخره!<br>" + +#: searx/templates/oscar/messages/first_time.html:7 +msgid "It look like you are using searx first time." +msgstr "به نظر می‌رسد اولین باری است که از searx استفاده می‌کنید." + +#: searx/templates/oscar/messages/no_cookies.html:3 +msgid "Information!" +msgstr "اطلاعات!" + +#: searx/templates/oscar/messages/no_cookies.html:4 +msgid "currently, there are no cookies defined." +msgstr "در حال حاضر کوکی‌ای تعریف نشده است." + +#: searx/templates/oscar/messages/no_data_available.html:4 +msgid "There is currently no data available. " +msgstr "در حال حاضر هیچ داده‌ای در دسترس نیست." + +#: searx/templates/oscar/messages/no_results.html:4 +#: searx/templates/simple/messages/no_results.html:4 +msgid "Engines cannot retrieve results." +msgstr "موتورها قادر به دریافت نتایج نیستند." + +#: searx/templates/oscar/messages/no_results.html:10 +#: searx/templates/simple/messages/no_results.html:10 +msgid "Please, try again later or find another searx instance." +msgstr "لطفا بعدا دوباره تلاش کنید و یا به دنبال نمونه‌ای دیگری از searx بگردید." + +#: searx/templates/oscar/messages/no_results.html:14 +#: searx/templates/simple/messages/no_results.html:14 +msgid "Sorry!" +msgstr "ببخشید!" + +#: searx/templates/oscar/messages/no_results.html:15 +#: searx/templates/simple/messages/no_results.html:15 +msgid "" +"we didn't find any results. Please use another query or search in more " +"categories." +msgstr "چیزی پیدا نشد. لطفا جستار دیگری را امتحان و یا در دسته‌ های بیشتری جستجو کنید." + +#: searx/templates/oscar/messages/save_settings_successfull.html:7 +msgid "Well done!" +msgstr "آفرین!<br>" + +#: searx/templates/oscar/messages/save_settings_successfull.html:8 +msgid "Settings saved successfully." +msgstr "تنظیمات با موفقیت ذخیره شد!<br>" + +#: searx/templates/oscar/messages/unknow_error.html:7 +msgid "Oh snap!" +msgstr "ای وای! خراب شد!<br>" + +#: searx/templates/oscar/messages/unknow_error.html:8 +msgid "Something went wrong." +msgstr "مشکلی رخ داد." + +#: searx/templates/oscar/result_templates/default.html:7 +#: searx/templates/simple/result_templates/default.html:6 +msgid "show media" +msgstr "نمایش رسانه<br>" + +#: searx/templates/oscar/result_templates/default.html:7 +#: searx/templates/simple/result_templates/default.html:6 +msgid "hide media" +msgstr "پنهان سازی رسانه<br>" + +#: searx/templates/oscar/result_templates/images.html:30 +msgid "Get image" +msgstr "دریافت تصویر" + +#: searx/templates/oscar/result_templates/images.html:33 +msgid "View source" +msgstr "نمایش منبع" + +#: searx/templates/oscar/result_templates/map.html:7 +#: searx/templates/simple/result_templates/map.html:7 +msgid "show map" +msgstr "نمایش نقشه" + +#: searx/templates/oscar/result_templates/map.html:7 +#: searx/templates/simple/result_templates/map.html:7 +msgid "hide map" +msgstr "پنهان‌سازی نقشه" + +#: searx/templates/oscar/result_templates/map.html:11 +#: searx/templates/simple/result_templates/map.html:11 +msgid "show details" +msgstr "نمایش جزئیات" + +#: searx/templates/oscar/result_templates/map.html:11 +#: searx/templates/simple/result_templates/map.html:11 +msgid "hide details" +msgstr "پنهان‌سازی جزئیات" + +#: searx/templates/oscar/result_templates/torrent.html:7 +#: searx/templates/simple/result_templates/torrent.html:11 +msgid "Filesize" +msgstr "اندازه فایل<br>" + +#: searx/templates/oscar/result_templates/torrent.html:9 +#: searx/templates/simple/result_templates/torrent.html:12 +msgid "Bytes" +msgstr "بایت" + +#: searx/templates/oscar/result_templates/torrent.html:10 +#: searx/templates/simple/result_templates/torrent.html:13 +msgid "kiB" +msgstr "کیلوبایت" + +#: searx/templates/oscar/result_templates/torrent.html:11 +#: searx/templates/simple/result_templates/torrent.html:14 +msgid "MiB" +msgstr "مگابایت" + +#: searx/templates/oscar/result_templates/torrent.html:12 +#: searx/templates/simple/result_templates/torrent.html:15 +msgid "GiB" +msgstr "گیگابایت" + +#: searx/templates/oscar/result_templates/torrent.html:13 +#: searx/templates/simple/result_templates/torrent.html:16 +msgid "TiB" +msgstr "ترابایت" + +#: searx/templates/oscar/result_templates/torrent.html:15 +#: searx/templates/simple/result_templates/torrent.html:20 +msgid "Number of Files" +msgstr "تعداد فایل ها" + +#: searx/templates/oscar/result_templates/videos.html:7 +#: searx/templates/simple/result_templates/videos.html:6 +msgid "show video" +msgstr "نمایش ویدئو" + +#: searx/templates/oscar/result_templates/videos.html:7 +#: searx/templates/simple/result_templates/videos.html:6 +msgid "hide video" +msgstr "پنهان‌سازی ویدئو" + +#: searx/templates/pix-art/results.html:28 +msgid "Load more..." +msgstr "بیشتر…<br>" + +#: searx/templates/simple/base.html:31 +msgid "No item found" +msgstr "چیزی پیدا نشد" + +#: searx/templates/simple/preferences.html:89 +msgid "Supports selected language" +msgstr "زبان انتخاب شده را پشتیبانی می‌کند" + +#: searx/templates/simple/preferences.html:118 +msgid "User interface" +msgstr "رابط کاربری" + +#: searx/templates/simple/preferences.html:154 +msgid "Privacy" +msgstr "حریم خصوصی" diff --git a/searx/translations/fi/LC_MESSAGES/messages.mo b/searx/translations/fi/LC_MESSAGES/messages.mo index c6aa15235d..b3905ca2f4 100644 Binary files a/searx/translations/fi/LC_MESSAGES/messages.mo and b/searx/translations/fi/LC_MESSAGES/messages.mo differ diff --git a/searx/translations/fil/LC_MESSAGES/messages.mo b/searx/translations/fil/LC_MESSAGES/messages.mo index df14318fbf..f1b4e75c77 100644 Binary files a/searx/translations/fil/LC_MESSAGES/messages.mo and b/searx/translations/fil/LC_MESSAGES/messages.mo differ diff --git a/searx/translations/fr/LC_MESSAGES/messages.mo b/searx/translations/fr/LC_MESSAGES/messages.mo index f9a72717a6..7fd3ee8917 100644 Binary files a/searx/translations/fr/LC_MESSAGES/messages.mo and b/searx/translations/fr/LC_MESSAGES/messages.mo differ diff --git a/searx/translations/fr/LC_MESSAGES/messages.po b/searx/translations/fr/LC_MESSAGES/messages.po index 60c8038059..4c076ddbf7 100644 --- a/searx/translations/fr/LC_MESSAGES/messages.po +++ b/searx/translations/fr/LC_MESSAGES/messages.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the PROJECT project. # # Translators: -# Alexandre Flament <alex@al-f.net>, 2017 +# Alexandre Flament <alex@al-f.net>, 2017-2018 # Benjamin Sonntag <benjamin@sonntag.fr>, 2014 # Cqoicebordel <david.barouh@wanadoo.fr>, 2014 # Cqoicebordel <david.barouh@wanadoo.fr>, 2014-2017 @@ -16,8 +16,8 @@ msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" "POT-Creation-Date: 2017-11-01 21:31+0100\n" -"PO-Revision-Date: 2017-11-03 12:00+0000\n" -"Last-Translator: Cqoicebordel <david.barouh@wanadoo.fr>\n" +"PO-Revision-Date: 2018-04-03 08:18+0000\n" +"Last-Translator: Alexandre Flament <alex@al-f.net>\n" "Language-Team: French (http://www.transifex.com/asciimoo/searx/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -84,7 +84,7 @@ msgstr "Paramètres non valides, veuillez éditer vos préférences" #: searx/webapp.py:415 msgid "Invalid settings" -msgstr "Réglages non valides" +msgstr "Paramètres non valides" #: searx/webapp.py:449 searx/webapp.py:493 msgid "search error" @@ -100,7 +100,7 @@ msgstr "il y a {hours} heure(s), {minutes} minute(s)" #: searx/answerers/random/answerer.py:53 msgid "Random value generator" -msgstr "Générateur aléatoire" +msgstr "Générateur de valeur aléatoire" #: searx/answerers/random/answerer.py:54 msgid "Generate different random values" @@ -138,7 +138,7 @@ msgstr "Score par résultat" #: searx/engines/__init__.py:214 searx/engines/flycheck___init__.py:221 msgid "Errors" -msgstr "Erreurs" +msgstr "Erreur" #: searx/engines/pdbe.py:87 msgid "{title} (OBSOLETE)" @@ -663,7 +663,7 @@ msgstr "Plugins" #: searx/templates/oscar/preferences.html:16 #: searx/templates/oscar/preferences.html:245 msgid "Answerers" -msgstr "Répondants" +msgstr "Réponses instantanées" #: searx/templates/oscar/preferences.html:17 #: searx/templates/oscar/preferences.html:272 diff --git a/searx/translations/gl/LC_MESSAGES/messages.mo b/searx/translations/gl/LC_MESSAGES/messages.mo new file mode 100644 index 0000000000..30d7b0dd60 Binary files /dev/null and b/searx/translations/gl/LC_MESSAGES/messages.mo differ diff --git a/searx/translations/gl/LC_MESSAGES/messages.po b/searx/translations/gl/LC_MESSAGES/messages.po new file mode 100644 index 0000000000..3e1e2230fd --- /dev/null +++ b/searx/translations/gl/LC_MESSAGES/messages.po @@ -0,0 +1,1013 @@ +# Translations template for PROJECT. +# Copyright (C) 2017 ORGANIZATION +# This file is distributed under the same license as the PROJECT project. +# +# Translators: +# Xosé M. Lamas <correo@xmgz.eu>, 2018 +msgid "" +msgstr "" +"Project-Id-Version: searx\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2017-11-01 21:31+0100\n" +"PO-Revision-Date: 2018-04-20 11:00+0000\n" +"Last-Translator: Xosé M. Lamas <correo@xmgz.eu>\n" +"Language-Team: Galician (http://www.transifex.com/asciimoo/searx/language/gl/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 2.3.4\n" +"Language: gl\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: searx/search.py:137 searx/search.py:182 +msgid "timeout" +msgstr "caducidade" + +#: searx/search.py:144 +msgid "request exception" +msgstr "excepción na petición" + +#: searx/search.py:151 +msgid "unexpected crash" +msgstr "fallo non agardado" + +#: searx/webapp.py:136 +msgid "files" +msgstr "ficheiros" + +#: searx/webapp.py:137 +msgid "general" +msgstr "xeral" + +#: searx/webapp.py:138 +msgid "music" +msgstr "música" + +#: searx/webapp.py:139 +msgid "social media" +msgstr "Medios sociais" + +#: searx/webapp.py:140 +msgid "images" +msgstr "imaxes" + +#: searx/webapp.py:141 +msgid "videos" +msgstr "vídeos" + +#: searx/webapp.py:142 +msgid "it" +msgstr "TIC" + +#: searx/webapp.py:143 +msgid "news" +msgstr "novas" + +#: searx/webapp.py:144 +msgid "map" +msgstr "mapa" + +#: searx/webapp.py:145 +msgid "science" +msgstr "ciencia" + +#: searx/webapp.py:399 searx/webapp.py:658 +msgid "Invalid settings, please edit your preferences" +msgstr "Axustes non válidos, por favor edite a configuración" + +#: searx/webapp.py:415 +msgid "Invalid settings" +msgstr "Axustes non válidos" + +#: searx/webapp.py:449 searx/webapp.py:493 +msgid "search error" +msgstr "fallo na busca" + +#: searx/webapp.py:530 +msgid "{minutes} minute(s) ago" +msgstr "hai {minutes} minuto(s)" + +#: searx/webapp.py:532 +msgid "{hours} hour(s), {minutes} minute(s) ago" +msgstr "hai {hours} hora(s), {minutes} minuto(s)" + +#: searx/answerers/random/answerer.py:53 +msgid "Random value generator" +msgstr "Xerador de valor aleatorio" + +#: searx/answerers/random/answerer.py:54 +msgid "Generate different random values" +msgstr "Xerar diferentes valores aleatorios" + +#: searx/answerers/statistics/answerer.py:53 +msgid "Statistics functions" +msgstr "Funcións de estatística" + +#: searx/answerers/statistics/answerer.py:54 +msgid "Compute {functions} of the arguments" +msgstr "Calcule {functions} dos argumentos" + +#: searx/engines/__init__.py:194 searx/engines/flycheck___init__.py:201 +msgid "Engine time (sec)" +msgstr "Tempo de busca (sec)" + +#: searx/engines/__init__.py:198 searx/engines/flycheck___init__.py:205 +msgid "Page loads (sec)" +msgstr "Cargou en (seg)" + +#: searx/engines/__init__.py:202 searx/engines/flycheck___init__.py:209 +#: searx/templates/oscar/results.html:95 +#: searx/templates/simple/results.html:20 +msgid "Number of results" +msgstr "Número de resultados" + +#: searx/engines/__init__.py:206 searx/engines/flycheck___init__.py:213 +msgid "Scores" +msgstr "Puntuacións" + +#: searx/engines/__init__.py:210 searx/engines/flycheck___init__.py:217 +msgid "Scores per result" +msgstr "Puntuacións por resultado" + +#: searx/engines/__init__.py:214 searx/engines/flycheck___init__.py:221 +msgid "Errors" +msgstr "Fallos" + +#: searx/engines/pdbe.py:87 +msgid "{title} (OBSOLETE)" +msgstr "{title} (OBSOLETO)" + +#: searx/engines/pdbe.py:91 +msgid "This entry has been superseded by" +msgstr "Esta entrada foi proporcionada por" + +#: searx/engines/pubmed.py:74 +msgid "No abstract is available for this publication." +msgstr "Non hai dispoñible un extracto para esta publicación." + +#: searx/plugins/https_rewrite.py:32 +msgid "Rewrite HTTP links to HTTPS if possible" +msgstr "Reescribir ligazóns HTTP a HTTPS si fose posible" + +#: searx/plugins/infinite_scroll.py:3 +msgid "Infinite scroll" +msgstr "Desplazamento infinito" + +#: searx/plugins/infinite_scroll.py:4 +msgid "Automatically load next page when scrolling to bottom of current page" +msgstr "Cargar automáticamente a seguinte páxina ao desplazarse ao fondo da páxina actual" + +#: searx/plugins/oa_doi_rewrite.py:9 +msgid "Open Access DOI rewrite" +msgstr "Reescritura Open Access DOI" + +#: searx/plugins/oa_doi_rewrite.py:10 +msgid "" +"Avoid paywalls by redirecting to open-access versions of publications when " +"available" +msgstr "Evitar muros de pago redirecciionando a versións públicas das publicacións cando estén dispoñibles" + +#: searx/plugins/open_results_on_new_tab.py:18 +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/simple/preferences.html:149 +msgid "Open result links on new browser tabs" +msgstr "Abrir ligazóns de resultados en novas lapelas do navegador" + +#: searx/plugins/open_results_on_new_tab.py:19 +msgid "" +"Results are opened in the same window by default. This plugin overwrites the" +" default behaviour to open links on new tabs/windows. (JavaScript required)" +msgstr "Por omisión, os resultados ábrense na mesma lapela. Este engadido sobreescribe o comportamento por omisión para abrir as ligazóns en novas lapelas/ventás. (Require JavaScript)" + +#: searx/plugins/search_on_category_select.py:18 +msgid "Search on category select" +msgstr "Busca en categoría seleccionada" + +#: searx/plugins/search_on_category_select.py:19 +msgid "" +"Perform search immediately if a category selected. Disable to select " +"multiple categories. (JavaScript required)" +msgstr "Busca ao momento si hai unha categoría seleccionada. Desactivar para seleccionar múltiples categorías. (Require JavaScript)" + +#: searx/plugins/self_info.py:20 +msgid "" +"Displays your IP if the query is \"ip\" and your user agent if the query " +"contains \"user agent\"." +msgstr "Mostra o seu IP si a consulta é \"ip\" e o seu Use Agent si a consulta contén \"user agent\"." + +#: searx/plugins/tracker_url_remover.py:26 +msgid "Tracker URL remover" +msgstr "Eliminador de rastrexadores na URL" + +#: searx/plugins/tracker_url_remover.py:27 +msgid "Remove trackers arguments from the returned URL" +msgstr "Elimina os argumentos de rastrexo da URL devolta" + +#: searx/plugins/vim_hotkeys.py:3 +msgid "Vim-like hotkeys" +msgstr "Atallos como os de Vim" + +#: searx/plugins/vim_hotkeys.py:4 +msgid "" +"Navigate search results with Vim-like hotkeys (JavaScript required). Press " +"\"h\" key on main or result page to get help." +msgstr "Navegar nos resultados da busca con atallos como os de Vim (require JavaScript). Pulse \"h\" na pantalla principal ou de resultados para obter axuda." + +#: searx/templates/courgette/404.html:4 searx/templates/legacy/404.html:4 +#: searx/templates/oscar/404.html:4 searx/templates/pix-art/404.html:4 +#: searx/templates/simple/404.html:4 +msgid "Page not found" +msgstr "Páxina non atopada" + +#: searx/templates/courgette/404.html:6 searx/templates/legacy/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +#: searx/templates/simple/404.html:6 +#, python-format +msgid "Go to %(search_page)s." +msgstr "Ir a %(search_page)s" + +#: searx/templates/courgette/404.html:6 searx/templates/legacy/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +#: searx/templates/simple/404.html:6 +msgid "search page" +msgstr "páxina de busca" + +#: searx/templates/courgette/index.html:9 +#: searx/templates/courgette/index.html:13 +#: searx/templates/courgette/results.html:5 +#: searx/templates/legacy/index.html:8 searx/templates/legacy/index.html:12 +#: searx/templates/oscar/navbar.html:7 +#: searx/templates/oscar/preferences.html:3 +#: searx/templates/pix-art/index.html:8 +msgid "preferences" +msgstr "axustes" + +#: searx/templates/courgette/index.html:11 +#: searx/templates/legacy/index.html:10 searx/templates/oscar/about.html:2 +#: searx/templates/oscar/navbar.html:6 searx/templates/pix-art/index.html:7 +msgid "about" +msgstr "Sobre" + +#: searx/templates/courgette/preferences.html:5 +#: searx/templates/legacy/preferences.html:5 +#: searx/templates/oscar/preferences.html:8 +#: searx/templates/pix-art/preferences.html:5 +#: searx/templates/simple/preferences.html:26 +msgid "Preferences" +msgstr "Axustes" + +#: searx/templates/courgette/preferences.html:9 +#: searx/templates/legacy/preferences.html:9 +#: searx/templates/oscar/preferences.html:33 +#: searx/templates/oscar/preferences.html:35 +#: searx/templates/simple/preferences.html:34 +msgid "Default categories" +msgstr "Categorías por omisión" + +#: searx/templates/courgette/preferences.html:13 +#: searx/templates/legacy/preferences.html:14 +#: searx/templates/oscar/preferences.html:41 +#: searx/templates/pix-art/preferences.html:9 +#: searx/templates/simple/preferences.html:39 +#: searx/templates/simple/preferences.html:163 +msgid "Search language" +msgstr "Idioma de busca" + +#: searx/templates/courgette/preferences.html:16 +#: searx/templates/legacy/preferences.html:17 +#: searx/templates/oscar/languages.html:6 +#: searx/templates/pix-art/preferences.html:12 +#: searx/templates/simple/languages.html:2 +#: searx/templates/simple/preferences.html:42 +msgid "Default language" +msgstr "Idioma por omisión" + +#: searx/templates/courgette/preferences.html:24 +#: searx/templates/legacy/preferences.html:25 +#: searx/templates/oscar/preferences.html:47 +#: searx/templates/pix-art/preferences.html:20 +#: searx/templates/simple/preferences.html:120 +msgid "Interface language" +msgstr "Idioma da interface" + +#: searx/templates/courgette/preferences.html:34 +#: searx/templates/legacy/preferences.html:35 +#: searx/templates/oscar/preferences.html:57 +#: searx/templates/simple/preferences.html:51 +msgid "Autocomplete" +msgstr "Autocompletar" + +#: searx/templates/courgette/preferences.html:45 +#: searx/templates/legacy/preferences.html:46 +#: searx/templates/oscar/preferences.html:68 +#: searx/templates/simple/preferences.html:166 +msgid "Image proxy" +msgstr "Proxy de imaxes" + +#: searx/templates/courgette/preferences.html:48 +#: searx/templates/legacy/preferences.html:49 +#: searx/templates/oscar/preferences.html:72 +#: searx/templates/simple/preferences.html:169 +msgid "Enabled" +msgstr "Activado" + +#: searx/templates/courgette/preferences.html:49 +#: searx/templates/legacy/preferences.html:50 +#: searx/templates/oscar/preferences.html:73 +#: searx/templates/simple/preferences.html:170 +msgid "Disabled" +msgstr "Desactivado" + +#: searx/templates/courgette/preferences.html:54 +#: searx/templates/legacy/preferences.html:55 +#: searx/templates/oscar/preferences.html:77 +#: searx/templates/pix-art/preferences.html:30 +#: searx/templates/simple/preferences.html:156 +msgid "Method" +msgstr "Método" + +#: searx/templates/courgette/preferences.html:63 +#: searx/templates/legacy/preferences.html:64 +#: searx/templates/oscar/preferences.html:86 +#: searx/templates/oscar/preferences.html:165 +#: searx/templates/oscar/preferences.html:173 +#: searx/templates/simple/preferences.html:63 +#: searx/templates/simple/preferences.html:90 +msgid "SafeSearch" +msgstr "Busca segura" + +#: searx/templates/courgette/preferences.html:66 +#: searx/templates/legacy/preferences.html:67 +#: searx/templates/oscar/preferences.html:90 +#: searx/templates/simple/preferences.html:66 +msgid "Strict" +msgstr "Stricta" + +#: searx/templates/courgette/preferences.html:67 +#: searx/templates/legacy/preferences.html:68 +#: searx/templates/oscar/preferences.html:91 +#: searx/templates/simple/preferences.html:67 +msgid "Moderate" +msgstr "Moderada" + +#: searx/templates/courgette/preferences.html:68 +#: searx/templates/legacy/preferences.html:69 +#: searx/templates/oscar/preferences.html:92 +#: searx/templates/simple/preferences.html:68 +msgid "None" +msgstr "Ningunha" + +#: searx/templates/courgette/preferences.html:73 +#: searx/templates/legacy/preferences.html:74 +#: searx/templates/oscar/preferences.html:96 +#: searx/templates/pix-art/preferences.html:39 +#: searx/templates/simple/preferences.html:131 +msgid "Themes" +msgstr "Decorado" + +#: searx/templates/courgette/preferences.html:83 +msgid "Color" +msgstr "Cor" + +#: searx/templates/courgette/preferences.html:86 +msgid "Blue (default)" +msgstr "Azul (por omisión)" + +#: searx/templates/courgette/preferences.html:87 +msgid "Violet" +msgstr "Violeta" + +#: searx/templates/courgette/preferences.html:88 +msgid "Green" +msgstr "Verde" + +#: searx/templates/courgette/preferences.html:89 +msgid "Cyan" +msgstr "Cian" + +#: searx/templates/courgette/preferences.html:90 +msgid "Orange" +msgstr "Laranxa" + +#: searx/templates/courgette/preferences.html:91 +msgid "Red" +msgstr "Vermello" + +#: searx/templates/courgette/preferences.html:96 +#: searx/templates/legacy/preferences.html:93 +#: searx/templates/pix-art/preferences.html:49 +#: searx/templates/simple/preferences.html:77 +msgid "Currently used search engines" +msgstr "Motores de busca utilizados actualmente" + +#: searx/templates/courgette/preferences.html:100 +#: searx/templates/legacy/preferences.html:97 +#: searx/templates/oscar/preferences.html:162 +#: searx/templates/oscar/preferences.html:176 +#: searx/templates/pix-art/preferences.html:53 +#: searx/templates/simple/preferences.html:87 +msgid "Engine name" +msgstr "Nome do motor" + +#: searx/templates/courgette/preferences.html:101 +#: searx/templates/legacy/preferences.html:98 +msgid "Category" +msgstr "Categoría" + +#: searx/templates/courgette/preferences.html:102 +#: searx/templates/courgette/preferences.html:113 +#: searx/templates/legacy/preferences.html:99 +#: searx/templates/legacy/preferences.html:110 +#: searx/templates/oscar/preferences.html:161 +#: searx/templates/oscar/preferences.html:177 +#: searx/templates/pix-art/preferences.html:54 +#: searx/templates/pix-art/preferences.html:64 +#: searx/templates/simple/preferences.html:86 +msgid "Allow" +msgstr "Permitir" + +#: searx/templates/courgette/preferences.html:102 +#: searx/templates/courgette/preferences.html:114 +#: searx/templates/legacy/preferences.html:99 +#: searx/templates/legacy/preferences.html:111 +#: searx/templates/pix-art/preferences.html:54 +#: searx/templates/pix-art/preferences.html:65 +msgid "Block" +msgstr "Bloquear" + +#: searx/templates/courgette/preferences.html:122 +#: searx/templates/legacy/preferences.html:119 +#: searx/templates/oscar/preferences.html:297 +#: searx/templates/pix-art/preferences.html:73 +#: searx/templates/simple/preferences.html:180 +msgid "" +"These settings are stored in your cookies, this allows us not to store this " +"data about you." +msgstr "Estos axustes gárdanse en testemuños, esto permítenos non ter que gardar ningún datos sobre vostede." + +#: searx/templates/courgette/preferences.html:124 +#: searx/templates/legacy/preferences.html:121 +#: searx/templates/oscar/preferences.html:299 +#: searx/templates/pix-art/preferences.html:75 +#: searx/templates/simple/preferences.html:182 +msgid "" +"These cookies serve your sole convenience, we don't use these cookies to " +"track you." +msgstr "Estos testemuños son para a súa conveniencia, non utilizamos estos testemuños para rastrexala." + +#: searx/templates/courgette/preferences.html:127 +#: searx/templates/legacy/preferences.html:124 +#: searx/templates/oscar/preferences.html:305 +#: searx/templates/pix-art/preferences.html:78 +#: searx/templates/simple/preferences.html:185 +msgid "save" +msgstr "gardar" + +#: searx/templates/courgette/preferences.html:128 +#: searx/templates/legacy/preferences.html:125 +#: searx/templates/oscar/preferences.html:307 +#: searx/templates/simple/preferences.html:186 +msgid "Reset defaults" +msgstr "Restablecer" + +#: searx/templates/courgette/preferences.html:129 +#: searx/templates/legacy/preferences.html:126 +#: searx/templates/oscar/preferences.html:306 +#: searx/templates/pix-art/preferences.html:79 +#: searx/templates/simple/preferences.html:187 +msgid "back" +msgstr "atrás" + +#: searx/templates/courgette/results.html:12 +#: searx/templates/legacy/results.html:13 +#: searx/templates/oscar/results.html:136 +#: searx/templates/simple/results.html:58 +msgid "Search URL" +msgstr "Busca URL" + +#: searx/templates/courgette/results.html:16 +#: searx/templates/legacy/results.html:17 +#: searx/templates/oscar/results.html:141 +#: searx/templates/simple/results.html:62 +msgid "Download results" +msgstr "Descargar resultados" + +#: searx/templates/courgette/results.html:34 +#: searx/templates/legacy/results.html:35 +#: searx/templates/simple/results.html:10 +msgid "Answers" +msgstr "Respostas" + +#: searx/templates/courgette/results.html:42 +#: searx/templates/legacy/results.html:43 +#: searx/templates/oscar/results.html:116 +#: searx/templates/simple/results.html:42 +msgid "Suggestions" +msgstr "Suxestións" + +#: searx/templates/courgette/results.html:70 +#: searx/templates/legacy/results.html:81 +#: searx/templates/oscar/results.html:68 searx/templates/oscar/results.html:78 +#: searx/templates/simple/results.html:130 +msgid "previous page" +msgstr "páxina anterior" + +#: searx/templates/courgette/results.html:81 +#: searx/templates/legacy/results.html:92 +#: searx/templates/oscar/results.html:62 searx/templates/oscar/results.html:84 +#: searx/templates/simple/results.html:145 +msgid "next page" +msgstr "páxina seguinte" + +#: searx/templates/courgette/search.html:3 +#: searx/templates/legacy/search.html:3 searx/templates/oscar/search.html:6 +#: searx/templates/oscar/search_full.html:9 +#: searx/templates/pix-art/search.html:3 searx/templates/simple/search.html:4 +msgid "Search for..." +msgstr "Buscar por..." + +#: searx/templates/courgette/stats.html:4 searx/templates/legacy/stats.html:4 +#: searx/templates/oscar/stats.html:5 searx/templates/pix-art/stats.html:4 +#: searx/templates/simple/stats.html:7 +msgid "Engine stats" +msgstr "Estatísticas do buscador" + +#: searx/templates/courgette/result_templates/images.html:4 +#: searx/templates/legacy/result_templates/images.html:4 +#: searx/templates/pix-art/result_templates/images.html:4 +msgid "original context" +msgstr "contexto orixinal" + +#: searx/templates/courgette/result_templates/torrent.html:7 +#: searx/templates/legacy/result_templates/torrent.html:11 +#: searx/templates/oscar/result_templates/torrent.html:6 +#: searx/templates/simple/result_templates/torrent.html:9 +msgid "Seeder" +msgstr "Sementadora" + +#: searx/templates/courgette/result_templates/torrent.html:7 +#: searx/templates/legacy/result_templates/torrent.html:11 +#: searx/templates/oscar/result_templates/torrent.html:6 +#: searx/templates/simple/result_templates/torrent.html:9 +msgid "Leecher" +msgstr "Cliente" + +#: searx/templates/courgette/result_templates/torrent.html:9 +#: searx/templates/legacy/result_templates/torrent.html:9 +#: searx/templates/oscar/macros.html:23 +#: searx/templates/simple/result_templates/torrent.html:6 +msgid "magnet link" +msgstr "ligazón magnet" + +#: searx/templates/courgette/result_templates/torrent.html:10 +#: searx/templates/legacy/result_templates/torrent.html:10 +#: searx/templates/oscar/macros.html:24 +#: searx/templates/simple/result_templates/torrent.html:7 +msgid "torrent file" +msgstr "ficheiro torrent" + +#: searx/templates/legacy/categories.html:8 +#: searx/templates/simple/categories.html:6 +msgid "Click on the magnifier to perform search" +msgstr "Pulse na lupa para realizar a busca" + +#: searx/templates/legacy/preferences.html:84 +#: searx/templates/oscar/preferences.html:113 +#: searx/templates/simple/preferences.html:142 +msgid "Results on new tabs" +msgstr "Resultados en novas lapelas" + +#: searx/templates/legacy/preferences.html:87 +#: searx/templates/oscar/preferences.html:117 +#: searx/templates/simple/preferences.html:145 +msgid "On" +msgstr "On" + +#: searx/templates/legacy/preferences.html:88 +#: searx/templates/oscar/preferences.html:118 +#: searx/templates/simple/preferences.html:146 +msgid "Off" +msgstr "Off" + +#: searx/templates/legacy/result_templates/code.html:3 +#: searx/templates/legacy/result_templates/default.html:3 +#: searx/templates/legacy/result_templates/map.html:9 +#: searx/templates/oscar/macros.html:34 searx/templates/oscar/macros.html:48 +#: searx/templates/simple/macros.html:43 +msgid "cached" +msgstr "en memoria" + +#: searx/templates/oscar/advanced.html:4 +msgid "Advanced settings" +msgstr "Axustes avanzados" + +#: searx/templates/oscar/base.html:62 +#: searx/templates/oscar/messages/first_time.html:4 +#: searx/templates/oscar/messages/save_settings_successfull.html:5 +#: searx/templates/oscar/messages/unknow_error.html:5 +msgid "Close" +msgstr "Pechar" + +#: searx/templates/oscar/base.html:64 +#: searx/templates/oscar/messages/no_results.html:4 +#: searx/templates/simple/messages/no_results.html:4 +#: searx/templates/simple/results.html:25 +msgid "Error!" +msgstr "Fallo!" + +#: searx/templates/oscar/base.html:90 searx/templates/simple/base.html:55 +msgid "Powered by" +msgstr "Proporcionado por" + +#: searx/templates/oscar/base.html:90 searx/templates/simple/base.html:55 +msgid "a privacy-respecting, hackable metasearch engine" +msgstr "un metabuscador configurable e respetuoso coa intimidade" + +#: searx/templates/oscar/macros.html:36 searx/templates/oscar/macros.html:50 +#: searx/templates/simple/macros.html:43 +msgid "proxied" +msgstr "a través de proxy" + +#: searx/templates/oscar/macros.html:92 +msgid "supported" +msgstr "soportado" + +#: searx/templates/oscar/macros.html:96 +msgid "not supported" +msgstr "non soportado" + +#: searx/templates/oscar/preferences.html:13 +#: searx/templates/oscar/preferences.html:22 +#: searx/templates/simple/preferences.html:32 +msgid "General" +msgstr "Xeral" + +#: searx/templates/oscar/preferences.html:14 +#: searx/templates/oscar/preferences.html:146 +#: searx/templates/simple/preferences.html:76 +msgid "Engines" +msgstr "Motores" + +#: searx/templates/oscar/preferences.html:15 +#: searx/templates/oscar/preferences.html:219 +msgid "Plugins" +msgstr "Engadidos" + +#: searx/templates/oscar/preferences.html:16 +#: searx/templates/oscar/preferences.html:245 +msgid "Answerers" +msgstr "Respostas" + +#: searx/templates/oscar/preferences.html:17 +#: searx/templates/oscar/preferences.html:272 +msgid "Cookies" +msgstr "Testemuños" + +#: searx/templates/oscar/preferences.html:42 +#: searx/templates/simple/preferences.html:48 +msgid "What language do you prefer for search?" +msgstr "Qué idioma prefire para buscar?" + +#: searx/templates/oscar/preferences.html:48 +#: searx/templates/simple/preferences.html:128 +msgid "Change the language of the layout" +msgstr "Cambiar o idioma da disposición" + +#: searx/templates/oscar/preferences.html:58 +#: searx/templates/simple/preferences.html:60 +msgid "Find stuff as you type" +msgstr "Buscar nas cousas metras escribe" + +#: searx/templates/oscar/preferences.html:69 +#: searx/templates/simple/preferences.html:173 +msgid "Proxying image results through searx" +msgstr "Utilizar o proxy de searx para as imaxes dos resultados" + +#: searx/templates/oscar/preferences.html:78 +msgid "" +"Change how forms are submited, <a " +"href=\"http://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods\"" +" rel=\"external\">learn more about request methods</a>" +msgstr "Cambiar cómo se envían os formularios, <a href=\"http://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods\" rel=\"external\">coñeza máis sobre os métodos de consulta</a>" + +#: searx/templates/oscar/preferences.html:87 +#: searx/templates/simple/preferences.html:71 +msgid "Filter content" +msgstr "Filtro de contido" + +#: searx/templates/oscar/preferences.html:97 +#: searx/templates/simple/preferences.html:139 +msgid "Change searx layout" +msgstr "Cambiar a disposición de searx" + +#: searx/templates/oscar/preferences.html:106 +#: searx/templates/oscar/preferences.html:111 +msgid "Choose style for this theme" +msgstr "Escolla o estilo para este decorado" + +#: searx/templates/oscar/preferences.html:106 +#: searx/templates/oscar/preferences.html:111 +msgid "Style" +msgstr "Estilo" + +#: searx/templates/oscar/preferences.html:122 +msgid "Open Access DOI resolver" +msgstr "Resolutor Open Access DOI" + +#: searx/templates/oscar/preferences.html:123 +msgid "" +"Redirect to open-access versions of publications when available (plugin " +"required)" +msgstr "Redireccionar a versións abertas das publicacións cando estén dispoñibles (require o engadido)" + +#: searx/templates/oscar/preferences.html:163 +#: searx/templates/oscar/preferences.html:175 +#: searx/templates/simple/preferences.html:88 +msgid "Shortcut" +msgstr "Atallo" + +#: searx/templates/oscar/preferences.html:164 +#: searx/templates/oscar/preferences.html:174 +msgid "Selected language" +msgstr "Idioma seleccionado" + +#: searx/templates/oscar/preferences.html:166 +#: searx/templates/oscar/preferences.html:172 +#: searx/templates/simple/preferences.html:91 +msgid "Time range" +msgstr "Rango temporal" + +#: searx/templates/oscar/preferences.html:167 +#: searx/templates/oscar/preferences.html:171 +#: searx/templates/simple/preferences.html:92 +msgid "Avg. time" +msgstr "Tempo medio" + +#: searx/templates/oscar/preferences.html:168 +#: searx/templates/oscar/preferences.html:170 +#: searx/templates/simple/preferences.html:93 +msgid "Max time" +msgstr "Tempo máx." + +#: searx/templates/oscar/preferences.html:248 +msgid "This is the list of searx's instant answering modules." +msgstr "Este é o listado dos módulos de respostas instantáneas de searx" + +#: searx/templates/oscar/preferences.html:252 +msgid "Name" +msgstr "Nome" + +#: searx/templates/oscar/preferences.html:253 +msgid "Keywords" +msgstr "Palabras chave" + +#: searx/templates/oscar/preferences.html:254 +msgid "Description" +msgstr "Descrición" + +#: searx/templates/oscar/preferences.html:255 +msgid "Examples" +msgstr "Exemplos" + +#: searx/templates/oscar/preferences.html:275 +msgid "" +"This is the list of cookies and their values searx is storing on your " +"computer." +msgstr "Este é o listados dos testemuños e os seus valores que searx almacena na súa computadora." + +#: searx/templates/oscar/preferences.html:276 +msgid "With that list, you can assess searx transparency." +msgstr "Con esta lista vostede pode comprobar a transparencia de searx." + +#: searx/templates/oscar/preferences.html:281 +msgid "Cookie name" +msgstr "Nome do testemuño" + +#: searx/templates/oscar/preferences.html:282 +msgid "Value" +msgstr "Valor" + +#: searx/templates/oscar/preferences.html:301 +msgid "Search URL of the currently saved preferences" +msgstr "URL de busca dos axustes gardados actualmente." + +#: searx/templates/oscar/preferences.html:301 +msgid "" +"Note: specifying custom settings in the search URL can reduce privacy by " +"leaking data to the clicked result sites." +msgstr "Nota: indicando axustes personalizados na URL de busca pode reducir a súa intimidade ao filtrar datos aos sitios web dos resultados." + +#: searx/templates/oscar/results.html:17 +msgid "Search results" +msgstr "Resultados da busca" + +#: searx/templates/oscar/results.html:21 +#: searx/templates/simple/results.html:84 +msgid "Try searching for:" +msgstr "Intente buscar:" + +#: searx/templates/oscar/results.html:100 +#: searx/templates/simple/results.html:25 +msgid "Engines cannot retrieve results" +msgstr "Os buscadores non obtiveron resultados" + +#: searx/templates/oscar/results.html:131 +msgid "Links" +msgstr "Ligazóns" + +#: searx/templates/oscar/search.html:8 +#: searx/templates/oscar/search_full.html:11 +#: searx/templates/simple/search.html:5 +msgid "Start search" +msgstr "Iniciar busca" + +#: searx/templates/oscar/stats.html:2 +msgid "stats" +msgstr "estatísticas" + +#: searx/templates/oscar/time-range.html:3 +#: searx/templates/simple/time-range.html:3 +msgid "Anytime" +msgstr "Calquer momento" + +#: searx/templates/oscar/time-range.html:6 +#: searx/templates/simple/time-range.html:6 +msgid "Last day" +msgstr "Último día" + +#: searx/templates/oscar/time-range.html:9 +#: searx/templates/simple/time-range.html:9 +msgid "Last week" +msgstr "Última semana" + +#: searx/templates/oscar/time-range.html:12 +#: searx/templates/simple/time-range.html:12 +msgid "Last month" +msgstr "Último mes" + +#: searx/templates/oscar/time-range.html:15 +#: searx/templates/simple/time-range.html:15 +msgid "Last year" +msgstr "Último ano" + +#: searx/templates/oscar/messages/first_time.html:6 +#: searx/templates/oscar/messages/no_data_available.html:3 +msgid "Heads up!" +msgstr "Heads up!" + +#: searx/templates/oscar/messages/first_time.html:7 +msgid "It look like you are using searx first time." +msgstr "Semella que é a primeira vez que utiliza searx." + +#: searx/templates/oscar/messages/no_cookies.html:3 +msgid "Information!" +msgstr "Información!" + +#: searx/templates/oscar/messages/no_cookies.html:4 +msgid "currently, there are no cookies defined." +msgstr "actualmente non hai testemuños establecidos." + +#: searx/templates/oscar/messages/no_data_available.html:4 +msgid "There is currently no data available. " +msgstr "Non hai datos dispoñibles." + +#: searx/templates/oscar/messages/no_results.html:4 +#: searx/templates/simple/messages/no_results.html:4 +msgid "Engines cannot retrieve results." +msgstr "Os buscadores non poden obter resultados." + +#: searx/templates/oscar/messages/no_results.html:10 +#: searx/templates/simple/messages/no_results.html:10 +msgid "Please, try again later or find another searx instance." +msgstr "Por favor, inténteo de novo máis tarde ou busque outra instancia de searx." + +#: searx/templates/oscar/messages/no_results.html:14 +#: searx/templates/simple/messages/no_results.html:14 +msgid "Sorry!" +msgstr "Sentímolo!" + +#: searx/templates/oscar/messages/no_results.html:15 +#: searx/templates/simple/messages/no_results.html:15 +msgid "" +"we didn't find any results. Please use another query or search in more " +"categories." +msgstr "non atopamos ningún resultado. Por favor, utilice outra consulta ou busque en máis categorías." + +#: searx/templates/oscar/messages/save_settings_successfull.html:7 +msgid "Well done!" +msgstr "Ben feito!" + +#: searx/templates/oscar/messages/save_settings_successfull.html:8 +msgid "Settings saved successfully." +msgstr "Gardáronse correctamente os Axustes." + +#: searx/templates/oscar/messages/unknow_error.html:7 +msgid "Oh snap!" +msgstr "Vaia!" + +#: searx/templates/oscar/messages/unknow_error.html:8 +msgid "Something went wrong." +msgstr "Algo fallou." + +#: searx/templates/oscar/result_templates/default.html:7 +#: searx/templates/simple/result_templates/default.html:6 +msgid "show media" +msgstr "mostrar medios" + +#: searx/templates/oscar/result_templates/default.html:7 +#: searx/templates/simple/result_templates/default.html:6 +msgid "hide media" +msgstr "agochar medios" + +#: searx/templates/oscar/result_templates/images.html:30 +msgid "Get image" +msgstr "Obter imaxe" + +#: searx/templates/oscar/result_templates/images.html:33 +msgid "View source" +msgstr "Ver fonte" + +#: searx/templates/oscar/result_templates/map.html:7 +#: searx/templates/simple/result_templates/map.html:7 +msgid "show map" +msgstr "mostrar mapa" + +#: searx/templates/oscar/result_templates/map.html:7 +#: searx/templates/simple/result_templates/map.html:7 +msgid "hide map" +msgstr "agochar mapa" + +#: searx/templates/oscar/result_templates/map.html:11 +#: searx/templates/simple/result_templates/map.html:11 +msgid "show details" +msgstr "mostrar detalles" + +#: searx/templates/oscar/result_templates/map.html:11 +#: searx/templates/simple/result_templates/map.html:11 +msgid "hide details" +msgstr "agochar detalles" + +#: searx/templates/oscar/result_templates/torrent.html:7 +#: searx/templates/simple/result_templates/torrent.html:11 +msgid "Filesize" +msgstr "Tamaño do ficheiro" + +#: searx/templates/oscar/result_templates/torrent.html:9 +#: searx/templates/simple/result_templates/torrent.html:12 +msgid "Bytes" +msgstr "Bytes" + +#: searx/templates/oscar/result_templates/torrent.html:10 +#: searx/templates/simple/result_templates/torrent.html:13 +msgid "kiB" +msgstr "kiB" + +#: searx/templates/oscar/result_templates/torrent.html:11 +#: searx/templates/simple/result_templates/torrent.html:14 +msgid "MiB" +msgstr "MiB" + +#: searx/templates/oscar/result_templates/torrent.html:12 +#: searx/templates/simple/result_templates/torrent.html:15 +msgid "GiB" +msgstr "GiB" + +#: searx/templates/oscar/result_templates/torrent.html:13 +#: searx/templates/simple/result_templates/torrent.html:16 +msgid "TiB" +msgstr "TiB" + +#: searx/templates/oscar/result_templates/torrent.html:15 +#: searx/templates/simple/result_templates/torrent.html:20 +msgid "Number of Files" +msgstr "Número de ficheiros" + +#: searx/templates/oscar/result_templates/videos.html:7 +#: searx/templates/simple/result_templates/videos.html:6 +msgid "show video" +msgstr "mostrar vídeo" + +#: searx/templates/oscar/result_templates/videos.html:7 +#: searx/templates/simple/result_templates/videos.html:6 +msgid "hide video" +msgstr "agochar vídeo" + +#: searx/templates/pix-art/results.html:28 +msgid "Load more..." +msgstr "Cargar máis..." + +#: searx/templates/simple/base.html:31 +msgid "No item found" +msgstr "Non se atoparon elementos" + +#: searx/templates/simple/preferences.html:89 +msgid "Supports selected language" +msgstr "Soporta o idioma seleccionado" + +#: searx/templates/simple/preferences.html:118 +msgid "User interface" +msgstr "Interface de usuaria" + +#: searx/templates/simple/preferences.html:154 +msgid "Privacy" +msgstr "Intimidade" diff --git a/searx/translations/he/LC_MESSAGES/messages.mo b/searx/translations/he/LC_MESSAGES/messages.mo index 10bb25c50c..c034025007 100644 Binary files a/searx/translations/he/LC_MESSAGES/messages.mo and b/searx/translations/he/LC_MESSAGES/messages.mo differ diff --git a/searx/translations/hr/LC_MESSAGES/messages.mo b/searx/translations/hr/LC_MESSAGES/messages.mo index ee986d5c9d..9e232a1513 100644 Binary files a/searx/translations/hr/LC_MESSAGES/messages.mo and b/searx/translations/hr/LC_MESSAGES/messages.mo differ diff --git a/searx/translations/hu/LC_MESSAGES/messages.mo b/searx/translations/hu/LC_MESSAGES/messages.mo index 4e06f2fd37..392dc99dff 100644 Binary files a/searx/translations/hu/LC_MESSAGES/messages.mo and b/searx/translations/hu/LC_MESSAGES/messages.mo differ diff --git a/searx/translations/it/LC_MESSAGES/messages.mo b/searx/translations/it/LC_MESSAGES/messages.mo index 49dabadcf1..53eca9e674 100644 Binary files a/searx/translations/it/LC_MESSAGES/messages.mo and b/searx/translations/it/LC_MESSAGES/messages.mo differ diff --git a/searx/translations/it/LC_MESSAGES/messages.po b/searx/translations/it/LC_MESSAGES/messages.po index b2db9b3f7f..c2d5c85887 100644 --- a/searx/translations/it/LC_MESSAGES/messages.po +++ b/searx/translations/it/LC_MESSAGES/messages.po @@ -5,18 +5,20 @@ # Translators: # Adam Tauber <asciimoo@gmail.com>, 2018 # caoswave, 2016 -# caoswave, 2016-2017 +# caoswave, 2016-2018 # dp <d.pitrolo@gmx.com>, 2014 # dp <d.pitrolo@gmx.com>, 2014,2017 +# Federico <fedett@gmail.com>, 2018 # Luca C <mybusiness@yopmail.com>, 2017 # Luc <luc.absil2@gmail.com>, 2015 +# Random_R, 2018 msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" "POT-Creation-Date: 2017-11-01 21:31+0100\n" -"PO-Revision-Date: 2018-02-01 22:21+0000\n" -"Last-Translator: Adam Tauber <asciimoo@gmail.com>\n" +"PO-Revision-Date: 2018-10-16 15:53+0000\n" +"Last-Translator: caoswave\n" "Language-Team: Italian (http://www.transifex.com/asciimoo/searx/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -31,7 +33,7 @@ msgstr "tempo scaduto" #: searx/search.py:144 msgid "request exception" -msgstr "" +msgstr "eccezione della richiesta" #: searx/search.py:151 msgid "unexpected crash" @@ -149,7 +151,7 @@ msgstr "Questa voce è stata sostituita da" #: searx/engines/pubmed.py:74 msgid "No abstract is available for this publication." -msgstr "" +msgstr "Nessun sommario disponibile per questa pubblicazione" #: searx/plugins/https_rewrite.py:32 msgid "Rewrite HTTP links to HTTPS if possible" @@ -199,7 +201,7 @@ msgstr "Esegui la ricerca immediatamente se una categoria è selezionata. Disabi msgid "" "Displays your IP if the query is \"ip\" and your user agent if the query " "contains \"user agent\"." -msgstr "Mostra il tuo IP se hai cercato \\\"ip\\\" ed il tuo user agent se hai cercato \\\"user agent\\\"." +msgstr "Mostra il tuo IP se hai cercato \"ip\" ed il tuo user agent se hai cercato \"user agent\"." #: searx/plugins/tracker_url_remover.py:26 msgid "Tracker URL remover" @@ -217,7 +219,7 @@ msgstr "Scorciatoie in stile Vim" msgid "" "Navigate search results with Vim-like hotkeys (JavaScript required). Press " "\"h\" key on main or result page to get help." -msgstr "Usa comandi in stile Vim per navigare tra i risultati (JavaScript necessario). Premi il tasto \\\"h\\\" per visualizzare la finestra d'aiuto." +msgstr "Usa comandi in stile Vim per navigare tra i risultati (JavaScript necessario). Premi il tasto \"h\" per visualizzare la finestra d'aiuto." #: searx/templates/courgette/404.html:4 searx/templates/legacy/404.html:4 #: searx/templates/oscar/404.html:4 searx/templates/pix-art/404.html:4 @@ -718,13 +720,13 @@ msgstr "Stile" #: searx/templates/oscar/preferences.html:122 msgid "Open Access DOI resolver" -msgstr "" +msgstr "Resolver Open Access DOI" #: searx/templates/oscar/preferences.html:123 msgid "" "Redirect to open-access versions of publications when available (plugin " "required)" -msgstr "" +msgstr "Indirizza a versioni open-access delle pubblicazioni quando disponibili (plugin richiesto)" #: searx/templates/oscar/preferences.html:163 #: searx/templates/oscar/preferences.html:175 @@ -795,13 +797,13 @@ msgstr "Valore" #: searx/templates/oscar/preferences.html:301 msgid "Search URL of the currently saved preferences" -msgstr "" +msgstr "Cerca URL delle preferenze attualmente salvate" #: searx/templates/oscar/preferences.html:301 msgid "" "Note: specifying custom settings in the search URL can reduce privacy by " "leaking data to the clicked result sites." -msgstr "" +msgstr "Nota: specificando impostazioni personalizzate nella ricerca URL può ridurre la privacy facendo traperlare dati ai siti cliccati" #: searx/templates/oscar/results.html:17 msgid "Search results" @@ -815,7 +817,7 @@ msgstr "Prova a cercare:" #: searx/templates/oscar/results.html:100 #: searx/templates/simple/results.html:25 msgid "Engines cannot retrieve results" -msgstr "" +msgstr "I motori di ricerca non riescono a recuperare risultati" #: searx/templates/oscar/results.html:131 msgid "Links" @@ -880,7 +882,7 @@ msgstr "Non ci sono dati attualmente disponibili." #: searx/templates/oscar/messages/no_results.html:4 #: searx/templates/simple/messages/no_results.html:4 msgid "Engines cannot retrieve results." -msgstr "" +msgstr "I motori di ricerca non riescono a recuperare risultati" #: searx/templates/oscar/messages/no_results.html:10 #: searx/templates/simple/messages/no_results.html:10 diff --git a/searx/translations/ja/LC_MESSAGES/messages.mo b/searx/translations/ja/LC_MESSAGES/messages.mo index 39ea698cbc..eb1267287a 100644 Binary files a/searx/translations/ja/LC_MESSAGES/messages.mo and b/searx/translations/ja/LC_MESSAGES/messages.mo differ diff --git a/searx/translations/ja/LC_MESSAGES/messages.po b/searx/translations/ja/LC_MESSAGES/messages.po index 11a297ca28..24d2c359ef 100644 --- a/searx/translations/ja/LC_MESSAGES/messages.po +++ b/searx/translations/ja/LC_MESSAGES/messages.po @@ -3,11 +3,12 @@ # This file is distributed under the same license as the PROJECT project. # # Translators: -# Akio Nishimura <akionux@gmail.com>, 2016-2017 +# Akio Nishimura <akionux@gmail.com>, 2016-2018 # Thomas Pointhuber, 2014-2015 # FIRST AUTHOR <EMAIL@ADDRESS>, 2014,2016 # Lucas Phillips <mail@lep.pw>, 2015 # Max <theshirinzu@gmail.com>, 2015 +# Nobuhiro Iwamatsu <iwamatsu@nigauri.org>, 2018 # pointhi, 2014 # Thomas Pointhuber, 2015-2016 msgid "" @@ -15,8 +16,8 @@ msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" "POT-Creation-Date: 2017-11-01 21:31+0100\n" -"PO-Revision-Date: 2017-11-01 20:31+0000\n" -"Last-Translator: Adam Tauber <asciimoo@gmail.com>\n" +"PO-Revision-Date: 2018-08-13 03:03+0000\n" +"Last-Translator: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>\n" "Language-Team: Japanese (http://www.transifex.com/asciimoo/searx/language/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -27,15 +28,15 @@ msgstr "" #: searx/search.py:137 searx/search.py:182 msgid "timeout" -msgstr "" +msgstr "タイムアウト" #: searx/search.py:144 msgid "request exception" -msgstr "" +msgstr "例外要求" #: searx/search.py:151 msgid "unexpected crash" -msgstr "" +msgstr "予期しないクラッシュ" #: searx/webapp.py:136 msgid "files" @@ -83,7 +84,7 @@ msgstr "不正な設定です。設定を編集してください。" #: searx/webapp.py:415 msgid "Invalid settings" -msgstr "" +msgstr "不正な設定" #: searx/webapp.py:449 searx/webapp.py:493 msgid "search error" @@ -149,11 +150,11 @@ msgstr "このエントリーの優先" #: searx/engines/pubmed.py:74 msgid "No abstract is available for this publication." -msgstr "" +msgstr "この出版物には要約がありません。" #: searx/plugins/https_rewrite.py:32 msgid "Rewrite HTTP links to HTTPS if possible" -msgstr "可能ならばHTTPリンクをHTTPSリンクに書き換える" +msgstr "可能ならば HTTP リンクを HTTPS リンクに書き換える" #: searx/plugins/infinite_scroll.py:3 msgid "Infinite scroll" @@ -165,7 +166,7 @@ msgstr "現在のページの下端でスクロールすると自動的に次の #: searx/plugins/oa_doi_rewrite.py:9 msgid "Open Access DOI rewrite" -msgstr "" +msgstr "オープンアクセス DOI リライト" #: searx/plugins/oa_doi_rewrite.py:10 msgid "" @@ -183,7 +184,7 @@ msgstr "検索結果のリンクを新しいタブで開く" msgid "" "Results are opened in the same window by default. This plugin overwrites the" " default behaviour to open links on new tabs/windows. (JavaScript required)" -msgstr "デフォルトでは結果は同じウィンドウで開きます。このプラグインはデフォルトの動作を書き換えて新しいタブ/ウィンドウで開くようにします。(JavaScriptが必要です)" +msgstr "デフォルトでは結果は同じウィンドウで開きます。このプラグインはデフォルトの動作を書き換えて新しいタブ/ウィンドウで開くようにします。(JavaScript が必要です)" #: searx/plugins/search_on_category_select.py:18 msgid "Search on category select" @@ -193,37 +194,37 @@ msgstr "カテゴリ選択したら検索を実行" msgid "" "Perform search immediately if a category selected. Disable to select " "multiple categories. (JavaScript required)" -msgstr "カテゴリが選択されたときに検索を実行します。複数のカテゴリを選択する場合は無効にします。(JavaScriptが必要です)" +msgstr "カテゴリが選択されたときに検索を実行します。複数のカテゴリを選択する場合は無効にします。(JavaScript が必要です)" #: searx/plugins/self_info.py:20 msgid "" "Displays your IP if the query is \"ip\" and your user agent if the query " "contains \"user agent\"." -msgstr "クエリが \"ip\" の場合にあなたのIPを、クエリに\"user agent\"が含まれる場合にあなたのユーザーエージェントを表示します。" +msgstr "クエリが \"ip\" の場合にあなたのIPを、クエリに \"user agent\" が含まれる場合にあなたのユーザーエージェントを表示します。" #: searx/plugins/tracker_url_remover.py:26 msgid "Tracker URL remover" -msgstr "トラッカーURLリムーバー" +msgstr "トラッカー URL リムーバー" #: searx/plugins/tracker_url_remover.py:27 msgid "Remove trackers arguments from the returned URL" -msgstr "返されたURLからトラッカー引数を消去します。" +msgstr "返された URL からトラッカー引数を消去する" #: searx/plugins/vim_hotkeys.py:3 msgid "Vim-like hotkeys" -msgstr "Vim風のホットキー" +msgstr "Vim 風のホットキー" #: searx/plugins/vim_hotkeys.py:4 msgid "" "Navigate search results with Vim-like hotkeys (JavaScript required). Press " "\"h\" key on main or result page to get help." -msgstr "検索結果をVim風のホットキーで操作します(JavaScriptが必要)。メインページまたは検索結果ページで\"h\"キーを押してヘルプを表示します。" +msgstr "検索結果をVim 風のホットキーで操作します(JavaScript が必要)。メインページまたは検索結果ページで \"h\" キーを押してヘルプを表示します。" #: searx/templates/courgette/404.html:4 searx/templates/legacy/404.html:4 #: searx/templates/oscar/404.html:4 searx/templates/pix-art/404.html:4 #: searx/templates/simple/404.html:4 msgid "Page not found" -msgstr "ページが見付かりません" +msgstr "ページが見つかりません" #: searx/templates/courgette/404.html:6 searx/templates/legacy/404.html:6 #: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 @@ -315,14 +316,14 @@ msgstr "画像プロキシ" #: searx/templates/oscar/preferences.html:72 #: searx/templates/simple/preferences.html:169 msgid "Enabled" -msgstr "有効にする" +msgstr "有効" #: searx/templates/courgette/preferences.html:49 #: searx/templates/legacy/preferences.html:50 #: searx/templates/oscar/preferences.html:73 #: searx/templates/simple/preferences.html:170 msgid "Disabled" -msgstr "使用不可能にする" +msgstr "無効" #: searx/templates/courgette/preferences.html:54 #: searx/templates/legacy/preferences.html:55 @@ -489,7 +490,7 @@ msgstr "戻る" #: searx/templates/oscar/results.html:136 #: searx/templates/simple/results.html:58 msgid "Search URL" -msgstr "URLを検索する" +msgstr "URL を検索する" #: searx/templates/courgette/results.html:16 #: searx/templates/legacy/results.html:17 @@ -623,7 +624,7 @@ msgstr "エラー!" #: searx/templates/oscar/base.html:90 searx/templates/simple/base.html:55 msgid "Powered by" -msgstr "提供:" +msgstr "Powered by" #: searx/templates/oscar/base.html:90 searx/templates/simple/base.html:55 msgid "a privacy-respecting, hackable metasearch engine" @@ -636,11 +637,11 @@ msgstr "プロキシされている" #: searx/templates/oscar/macros.html:92 msgid "supported" -msgstr "" +msgstr "サポート" #: searx/templates/oscar/macros.html:96 msgid "not supported" -msgstr "" +msgstr "未サポート" #: searx/templates/oscar/preferences.html:13 #: searx/templates/oscar/preferences.html:22 @@ -672,12 +673,12 @@ msgstr "クッキー" #: searx/templates/oscar/preferences.html:42 #: searx/templates/simple/preferences.html:48 msgid "What language do you prefer for search?" -msgstr "検索に使う言語はどれが良いですか？" +msgstr "検索に使う言語はどれが良いですか?" #: searx/templates/oscar/preferences.html:48 #: searx/templates/simple/preferences.html:128 msgid "Change the language of the layout" -msgstr "表示する言語を変更できます" +msgstr "表示する言語を変更" #: searx/templates/oscar/preferences.html:58 #: searx/templates/simple/preferences.html:60 @@ -687,7 +688,7 @@ msgstr "入力補助に使う検索エンジン" #: searx/templates/oscar/preferences.html:69 #: searx/templates/simple/preferences.html:173 msgid "Proxying image results through searx" -msgstr "画像検索結果をsearxでプロキシする" +msgstr "画像検索結果を searx でプロキシする" #: searx/templates/oscar/preferences.html:78 msgid "" @@ -704,7 +705,7 @@ msgstr "コンテンツをフィルタリングする" #: searx/templates/oscar/preferences.html:97 #: searx/templates/simple/preferences.html:139 msgid "Change searx layout" -msgstr "searxのレイアウトの変更" +msgstr "Searx のレイアウトの変更" #: searx/templates/oscar/preferences.html:106 #: searx/templates/oscar/preferences.html:111 @@ -718,13 +719,13 @@ msgstr "スタイル" #: searx/templates/oscar/preferences.html:122 msgid "Open Access DOI resolver" -msgstr "" +msgstr "オープンアクセス DOI リゾルバー" #: searx/templates/oscar/preferences.html:123 msgid "" "Redirect to open-access versions of publications when available (plugin " "required)" -msgstr "" +msgstr "利用可能な場合(プラグインが必要)、オープンアクセス版の出版物にリダイレクトする" #: searx/templates/oscar/preferences.html:163 #: searx/templates/oscar/preferences.html:175 @@ -735,7 +736,7 @@ msgstr "ショートカット" #: searx/templates/oscar/preferences.html:164 #: searx/templates/oscar/preferences.html:174 msgid "Selected language" -msgstr "" +msgstr "選択された言語" #: searx/templates/oscar/preferences.html:166 #: searx/templates/oscar/preferences.html:172 @@ -757,7 +758,7 @@ msgstr "最大時間" #: searx/templates/oscar/preferences.html:248 msgid "This is the list of searx's instant answering modules." -msgstr "これはsearxの即席回答モジュールのリストです。" +msgstr "これは searx の即席回答モジュールのリストです。" #: searx/templates/oscar/preferences.html:252 msgid "Name" @@ -783,7 +784,7 @@ msgstr "これはクッキーのリストで、これらの値はあなたのコ #: searx/templates/oscar/preferences.html:276 msgid "With that list, you can assess searx transparency." -msgstr "このリストによって、あなたはsearxの透明性を評価できます。" +msgstr "このリストによって、あなたは searx の透明性を評価できます。" #: searx/templates/oscar/preferences.html:281 msgid "Cookie name" @@ -795,13 +796,13 @@ msgstr "値" #: searx/templates/oscar/preferences.html:301 msgid "Search URL of the currently saved preferences" -msgstr "" +msgstr "現在保存されている設定の検索 URL" #: searx/templates/oscar/preferences.html:301 msgid "" "Note: specifying custom settings in the search URL can reduce privacy by " "leaking data to the clicked result sites." -msgstr "" +msgstr "注意: 検索 URL にカスタム設定を指定すると、クリックした結果サイトにデータが漏洩し、プライバシーが低下する恐れがあります。" #: searx/templates/oscar/results.html:17 msgid "Search results" @@ -810,12 +811,12 @@ msgstr "検索結果" #: searx/templates/oscar/results.html:21 #: searx/templates/simple/results.html:84 msgid "Try searching for:" -msgstr "" +msgstr "検索:" #: searx/templates/oscar/results.html:100 #: searx/templates/simple/results.html:25 msgid "Engines cannot retrieve results" -msgstr "" +msgstr "エンジンは結果を取得できません" #: searx/templates/oscar/results.html:131 msgid "Links" @@ -859,15 +860,15 @@ msgstr "去年" #: searx/templates/oscar/messages/first_time.html:6 #: searx/templates/oscar/messages/no_data_available.html:3 msgid "Heads up!" -msgstr "お知らせ" +msgstr "気をつけて!" #: searx/templates/oscar/messages/first_time.html:7 msgid "It look like you are using searx first time." -msgstr "searxを使うのは初めてようですね。" +msgstr "Searxを使うのは初めてようですね。" #: searx/templates/oscar/messages/no_cookies.html:3 msgid "Information!" -msgstr "お知らせ" +msgstr "お知らせ!" #: searx/templates/oscar/messages/no_cookies.html:4 msgid "currently, there are no cookies defined." @@ -880,12 +881,12 @@ msgstr "現在データがありません。" #: searx/templates/oscar/messages/no_results.html:4 #: searx/templates/simple/messages/no_results.html:4 msgid "Engines cannot retrieve results." -msgstr "" +msgstr "エンジンは結果を取得できません。" #: searx/templates/oscar/messages/no_results.html:10 #: searx/templates/simple/messages/no_results.html:10 msgid "Please, try again later or find another searx instance." -msgstr "" +msgstr "後でやり直すか、別の searx インスタンスを探して下さい。" #: searx/templates/oscar/messages/no_results.html:14 #: searx/templates/simple/messages/no_results.html:14 @@ -901,7 +902,7 @@ msgstr "検索結果はありませんでした。別カテゴリで、他のク #: searx/templates/oscar/messages/save_settings_successfull.html:7 msgid "Well done!" -msgstr "あっぱれ。" +msgstr "あっぱれ!" #: searx/templates/oscar/messages/save_settings_successfull.html:8 msgid "Settings saved successfully." @@ -909,7 +910,7 @@ msgstr "設定の保存に成功しました。" #: searx/templates/oscar/messages/unknow_error.html:7 msgid "Oh snap!" -msgstr "ちぇっ" +msgstr "ちぇっ!" #: searx/templates/oscar/messages/unknow_error.html:8 msgid "Something went wrong." @@ -956,7 +957,7 @@ msgstr "詳細を隠す" #: searx/templates/oscar/result_templates/torrent.html:7 #: searx/templates/simple/result_templates/torrent.html:11 msgid "Filesize" -msgstr "ファイル･サイズ" +msgstr "ファイルサイズ" #: searx/templates/oscar/result_templates/torrent.html:9 #: searx/templates/simple/result_templates/torrent.html:12 @@ -1004,16 +1005,16 @@ msgstr "もっと見る…" #: searx/templates/simple/base.html:31 msgid "No item found" -msgstr "" +msgstr "アイテムが見つかりません" #: searx/templates/simple/preferences.html:89 msgid "Supports selected language" -msgstr "選択している言語のサポート" +msgstr "選択された言語のサポート" #: searx/templates/simple/preferences.html:118 msgid "User interface" -msgstr "" +msgstr "ユーザーインターフェース" #: searx/templates/simple/preferences.html:154 msgid "Privacy" -msgstr "" +msgstr "プライバシー" diff --git a/searx/translations/nl/LC_MESSAGES/messages.mo b/searx/translations/nl/LC_MESSAGES/messages.mo index 15fcacbc4a..057853be52 100644 Binary files a/searx/translations/nl/LC_MESSAGES/messages.mo and b/searx/translations/nl/LC_MESSAGES/messages.mo differ diff --git a/searx/translations/nl/LC_MESSAGES/messages.po b/searx/translations/nl/LC_MESSAGES/messages.po index 1fc8700f95..b4e0614025 100644 --- a/searx/translations/nl/LC_MESSAGES/messages.po +++ b/searx/translations/nl/LC_MESSAGES/messages.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the PROJECT project. # # Translators: -# André Koot <meneer@tken.net>, 2014-2017 +# André Koot <meneer@tken.net>, 2014-2018 # Nathan Follens, 2015-2018 # Rejo Zenger <rejo@zenger.nl>, 2016-2017 msgid "" @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" "POT-Creation-Date: 2017-11-01 21:31+0100\n" -"PO-Revision-Date: 2018-02-15 22:43+0000\n" -"Last-Translator: Nathan Follens\n" +"PO-Revision-Date: 2018-09-22 06:46+0000\n" +"Last-Translator: André Koot <meneer@tken.net>\n" "Language-Team: Dutch (http://www.transifex.com/asciimoo/searx/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -835,7 +835,7 @@ msgstr "Altijd" #: searx/templates/oscar/time-range.html:6 #: searx/templates/simple/time-range.html:6 msgid "Last day" -msgstr "Voorbije dag" +msgstr "Gisteren" #: searx/templates/oscar/time-range.html:9 #: searx/templates/simple/time-range.html:9 @@ -881,7 +881,7 @@ msgstr "Zoekmachines konden geen resultaten ophalen." #: searx/templates/oscar/messages/no_results.html:10 #: searx/templates/simple/messages/no_results.html:10 msgid "Please, try again later or find another searx instance." -msgstr "Probeer het later opnieuw, of gebruik een andere instantie van searx." +msgstr "Probeer het later opnieuw, of gebruik een andere searx server." #: searx/templates/oscar/messages/no_results.html:14 #: searx/templates/simple/messages/no_results.html:14 diff --git a/searx/translations/nl_BE/LC_MESSAGES/messages.mo b/searx/translations/nl_BE/LC_MESSAGES/messages.mo new file mode 100644 index 0000000000..e233f5c897 Binary files /dev/null and b/searx/translations/nl_BE/LC_MESSAGES/messages.mo differ diff --git a/searx/translations/nl_BE/LC_MESSAGES/messages.po b/searx/translations/nl_BE/LC_MESSAGES/messages.po new file mode 100644 index 0000000000..c4ef0228ac --- /dev/null +++ b/searx/translations/nl_BE/LC_MESSAGES/messages.po @@ -0,0 +1,1013 @@ +# Translations template for PROJECT. +# Copyright (C) 2017 ORGANIZATION +# This file is distributed under the same license as the PROJECT project. +# +# Translators: +# Nathan Follens, 2018 +msgid "" +msgstr "" +"Project-Id-Version: searx\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2017-11-01 21:31+0100\n" +"PO-Revision-Date: 2018-06-24 07:59+0000\n" +"Last-Translator: Nathan Follens\n" +"Language-Team: Dutch (Belgium) (http://www.transifex.com/asciimoo/searx/language/nl_BE/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 2.3.4\n" +"Language: nl_BE\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: searx/search.py:137 searx/search.py:182 +msgid "timeout" +msgstr "time-out" + +#: searx/search.py:144 +msgid "request exception" +msgstr "aanvraaguitzondering" + +#: searx/search.py:151 +msgid "unexpected crash" +msgstr "onverwachte crash" + +#: searx/webapp.py:136 +msgid "files" +msgstr "bestanden" + +#: searx/webapp.py:137 +msgid "general" +msgstr "algemeen" + +#: searx/webapp.py:138 +msgid "music" +msgstr "muziek" + +#: searx/webapp.py:139 +msgid "social media" +msgstr "sociale media" + +#: searx/webapp.py:140 +msgid "images" +msgstr "afbeeldingen" + +#: searx/webapp.py:141 +msgid "videos" +msgstr "video’s" + +#: searx/webapp.py:142 +msgid "it" +msgstr "IT" + +#: searx/webapp.py:143 +msgid "news" +msgstr "nieuws" + +#: searx/webapp.py:144 +msgid "map" +msgstr "kaart" + +#: searx/webapp.py:145 +msgid "science" +msgstr "wetenschap" + +#: searx/webapp.py:399 searx/webapp.py:658 +msgid "Invalid settings, please edit your preferences" +msgstr "Ongeldige instellingen, werkt uw voorkeuren bij" + +#: searx/webapp.py:415 +msgid "Invalid settings" +msgstr "Ongeldige instellingen" + +#: searx/webapp.py:449 searx/webapp.py:493 +msgid "search error" +msgstr "zoekfout" + +#: searx/webapp.py:530 +msgid "{minutes} minute(s) ago" +msgstr "{minutes} min geleden" + +#: searx/webapp.py:532 +msgid "{hours} hour(s), {minutes} minute(s) ago" +msgstr "{hours} uur, {minutes} min geleden" + +#: searx/answerers/random/answerer.py:53 +msgid "Random value generator" +msgstr "Willekeurigewaardegenerator" + +#: searx/answerers/random/answerer.py:54 +msgid "Generate different random values" +msgstr "Genereert verschillende willekeurige waarden" + +#: searx/answerers/statistics/answerer.py:53 +msgid "Statistics functions" +msgstr "Statistische functies" + +#: searx/answerers/statistics/answerer.py:54 +msgid "Compute {functions} of the arguments" +msgstr "Berekent {functions} van de argumenten" + +#: searx/engines/__init__.py:194 searx/engines/flycheck___init__.py:201 +msgid "Engine time (sec)" +msgstr "Snelheid zoekmachien (sec)" + +#: searx/engines/__init__.py:198 searx/engines/flycheck___init__.py:205 +msgid "Page loads (sec)" +msgstr "Laden van pagina’s (sec)" + +#: searx/engines/__init__.py:202 searx/engines/flycheck___init__.py:209 +#: searx/templates/oscar/results.html:95 +#: searx/templates/simple/results.html:20 +msgid "Number of results" +msgstr "Aantal zoekresultaten" + +#: searx/engines/__init__.py:206 searx/engines/flycheck___init__.py:213 +msgid "Scores" +msgstr "Scores" + +#: searx/engines/__init__.py:210 searx/engines/flycheck___init__.py:217 +msgid "Scores per result" +msgstr "Scores per zoekresultaat" + +#: searx/engines/__init__.py:214 searx/engines/flycheck___init__.py:221 +msgid "Errors" +msgstr "Fouten" + +#: searx/engines/pdbe.py:87 +msgid "{title} (OBSOLETE)" +msgstr "{title} (VEROUDERD)" + +#: searx/engines/pdbe.py:91 +msgid "This entry has been superseded by" +msgstr "Dit object is vervangen door" + +#: searx/engines/pubmed.py:74 +msgid "No abstract is available for this publication." +msgstr "Voor deze publicatie is geen abstract beschikbaar." + +#: searx/plugins/https_rewrite.py:32 +msgid "Rewrite HTTP links to HTTPS if possible" +msgstr "Herschrijft HTTP-koppelingen naar HTTPS, indien mogelijk" + +#: searx/plugins/infinite_scroll.py:3 +msgid "Infinite scroll" +msgstr "Oneindig scrollen" + +#: searx/plugins/infinite_scroll.py:4 +msgid "Automatically load next page when scrolling to bottom of current page" +msgstr "Volgende pagina automatisch laden bij bereiken van den onderkant van de huidige pagina" + +#: searx/plugins/oa_doi_rewrite.py:9 +msgid "Open Access DOI rewrite" +msgstr "Open Access DOI herschrijven" + +#: searx/plugins/oa_doi_rewrite.py:10 +msgid "" +"Avoid paywalls by redirecting to open-access versions of publications when " +"available" +msgstr "Omzeilt betaalmuren met een doorverwijzing naar vrij toegankelijke versies van publicaties indien beschikbaar" + +#: searx/plugins/open_results_on_new_tab.py:18 +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/simple/preferences.html:149 +msgid "Open result links on new browser tabs" +msgstr "Koppelingen openen in nieuwe tabbladen" + +#: searx/plugins/open_results_on_new_tab.py:19 +msgid "" +"Results are opened in the same window by default. This plugin overwrites the" +" default behaviour to open links on new tabs/windows. (JavaScript required)" +msgstr "Resultaten worden standaard in hetzelfde venster geopend. Deze plug-in overschrijft het standaardgedrag zodat koppelingen in nieuwe tabbladen/vensters worden geopend. (JavaScript vereist)" + +#: searx/plugins/search_on_category_select.py:18 +msgid "Search on category select" +msgstr "Zoeken bij selecteren van categorie" + +#: searx/plugins/search_on_category_select.py:19 +msgid "" +"Perform search immediately if a category selected. Disable to select " +"multiple categories. (JavaScript required)" +msgstr "Zoekopdracht onmiddellijk uitvoeren wanneer dat een categorie wordt geselecteerd. Zet dit uit voor meerdere categorieën te selecteren. (JavaScript vereist)" + +#: searx/plugins/self_info.py:20 +msgid "" +"Displays your IP if the query is \"ip\" and your user agent if the query " +"contains \"user agent\"." +msgstr "Geeft uw IP-adres weer als de zoekopdracht ‘ip’ is, en uwe gebruikersagent als de zoekopdracht ‘user agent’ bevat." + +#: searx/plugins/tracker_url_remover.py:26 +msgid "Tracker URL remover" +msgstr "Tracker-URL-verwijderaar" + +#: searx/plugins/tracker_url_remover.py:27 +msgid "Remove trackers arguments from the returned URL" +msgstr "Verwijdert trackerargumenten van de gekregen URL" + +#: searx/plugins/vim_hotkeys.py:3 +msgid "Vim-like hotkeys" +msgstr "Sneltoetsen gelijk in Vim" + +#: searx/plugins/vim_hotkeys.py:4 +msgid "" +"Navigate search results with Vim-like hotkeys (JavaScript required). Press " +"\"h\" key on main or result page to get help." +msgstr "Bladert door zoekresultaten met sneltoetsen gelijk die in Vim (JavaScript vereist). Drukt op ‘h’ op de hoofdpagina of de pagina met resultaten voor hulp." + +#: searx/templates/courgette/404.html:4 searx/templates/legacy/404.html:4 +#: searx/templates/oscar/404.html:4 searx/templates/pix-art/404.html:4 +#: searx/templates/simple/404.html:4 +msgid "Page not found" +msgstr "Pagina niet gevonden" + +#: searx/templates/courgette/404.html:6 searx/templates/legacy/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +#: searx/templates/simple/404.html:6 +#, python-format +msgid "Go to %(search_page)s." +msgstr "Ga naar %(search_page)s." + +#: searx/templates/courgette/404.html:6 searx/templates/legacy/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +#: searx/templates/simple/404.html:6 +msgid "search page" +msgstr "zoekpagina" + +#: searx/templates/courgette/index.html:9 +#: searx/templates/courgette/index.html:13 +#: searx/templates/courgette/results.html:5 +#: searx/templates/legacy/index.html:8 searx/templates/legacy/index.html:12 +#: searx/templates/oscar/navbar.html:7 +#: searx/templates/oscar/preferences.html:3 +#: searx/templates/pix-art/index.html:8 +msgid "preferences" +msgstr "voorkeuren" + +#: searx/templates/courgette/index.html:11 +#: searx/templates/legacy/index.html:10 searx/templates/oscar/about.html:2 +#: searx/templates/oscar/navbar.html:6 searx/templates/pix-art/index.html:7 +msgid "about" +msgstr "over" + +#: searx/templates/courgette/preferences.html:5 +#: searx/templates/legacy/preferences.html:5 +#: searx/templates/oscar/preferences.html:8 +#: searx/templates/pix-art/preferences.html:5 +#: searx/templates/simple/preferences.html:26 +msgid "Preferences" +msgstr "Voorkeuren" + +#: searx/templates/courgette/preferences.html:9 +#: searx/templates/legacy/preferences.html:9 +#: searx/templates/oscar/preferences.html:33 +#: searx/templates/oscar/preferences.html:35 +#: searx/templates/simple/preferences.html:34 +msgid "Default categories" +msgstr "Standaardcategorieën" + +#: searx/templates/courgette/preferences.html:13 +#: searx/templates/legacy/preferences.html:14 +#: searx/templates/oscar/preferences.html:41 +#: searx/templates/pix-art/preferences.html:9 +#: searx/templates/simple/preferences.html:39 +#: searx/templates/simple/preferences.html:163 +msgid "Search language" +msgstr "Zoektaal" + +#: searx/templates/courgette/preferences.html:16 +#: searx/templates/legacy/preferences.html:17 +#: searx/templates/oscar/languages.html:6 +#: searx/templates/pix-art/preferences.html:12 +#: searx/templates/simple/languages.html:2 +#: searx/templates/simple/preferences.html:42 +msgid "Default language" +msgstr "Standaardtaal" + +#: searx/templates/courgette/preferences.html:24 +#: searx/templates/legacy/preferences.html:25 +#: searx/templates/oscar/preferences.html:47 +#: searx/templates/pix-art/preferences.html:20 +#: searx/templates/simple/preferences.html:120 +msgid "Interface language" +msgstr "Interfacetaal" + +#: searx/templates/courgette/preferences.html:34 +#: searx/templates/legacy/preferences.html:35 +#: searx/templates/oscar/preferences.html:57 +#: searx/templates/simple/preferences.html:51 +msgid "Autocomplete" +msgstr "Auto-aanvullen" + +#: searx/templates/courgette/preferences.html:45 +#: searx/templates/legacy/preferences.html:46 +#: searx/templates/oscar/preferences.html:68 +#: searx/templates/simple/preferences.html:166 +msgid "Image proxy" +msgstr "Afbeeldingsproxy" + +#: searx/templates/courgette/preferences.html:48 +#: searx/templates/legacy/preferences.html:49 +#: searx/templates/oscar/preferences.html:72 +#: searx/templates/simple/preferences.html:169 +msgid "Enabled" +msgstr "Ingeschakeld" + +#: searx/templates/courgette/preferences.html:49 +#: searx/templates/legacy/preferences.html:50 +#: searx/templates/oscar/preferences.html:73 +#: searx/templates/simple/preferences.html:170 +msgid "Disabled" +msgstr "Uitgeschakeld" + +#: searx/templates/courgette/preferences.html:54 +#: searx/templates/legacy/preferences.html:55 +#: searx/templates/oscar/preferences.html:77 +#: searx/templates/pix-art/preferences.html:30 +#: searx/templates/simple/preferences.html:156 +msgid "Method" +msgstr "Methode" + +#: searx/templates/courgette/preferences.html:63 +#: searx/templates/legacy/preferences.html:64 +#: searx/templates/oscar/preferences.html:86 +#: searx/templates/oscar/preferences.html:165 +#: searx/templates/oscar/preferences.html:173 +#: searx/templates/simple/preferences.html:63 +#: searx/templates/simple/preferences.html:90 +msgid "SafeSearch" +msgstr "SafeSearch" + +#: searx/templates/courgette/preferences.html:66 +#: searx/templates/legacy/preferences.html:67 +#: searx/templates/oscar/preferences.html:90 +#: searx/templates/simple/preferences.html:66 +msgid "Strict" +msgstr "Strikt" + +#: searx/templates/courgette/preferences.html:67 +#: searx/templates/legacy/preferences.html:68 +#: searx/templates/oscar/preferences.html:91 +#: searx/templates/simple/preferences.html:67 +msgid "Moderate" +msgstr "Gemiddeld" + +#: searx/templates/courgette/preferences.html:68 +#: searx/templates/legacy/preferences.html:69 +#: searx/templates/oscar/preferences.html:92 +#: searx/templates/simple/preferences.html:68 +msgid "None" +msgstr "Geen" + +#: searx/templates/courgette/preferences.html:73 +#: searx/templates/legacy/preferences.html:74 +#: searx/templates/oscar/preferences.html:96 +#: searx/templates/pix-art/preferences.html:39 +#: searx/templates/simple/preferences.html:131 +msgid "Themes" +msgstr "Thema’s" + +#: searx/templates/courgette/preferences.html:83 +msgid "Color" +msgstr "Kleur" + +#: searx/templates/courgette/preferences.html:86 +msgid "Blue (default)" +msgstr "Blauw (standaard)" + +#: searx/templates/courgette/preferences.html:87 +msgid "Violet" +msgstr "Paars" + +#: searx/templates/courgette/preferences.html:88 +msgid "Green" +msgstr "Groen" + +#: searx/templates/courgette/preferences.html:89 +msgid "Cyan" +msgstr "Appelblauwzeegroen" + +#: searx/templates/courgette/preferences.html:90 +msgid "Orange" +msgstr "Oranje" + +#: searx/templates/courgette/preferences.html:91 +msgid "Red" +msgstr "Rood" + +#: searx/templates/courgette/preferences.html:96 +#: searx/templates/legacy/preferences.html:93 +#: searx/templates/pix-art/preferences.html:49 +#: searx/templates/simple/preferences.html:77 +msgid "Currently used search engines" +msgstr "Momenteel gebruikte zoekmachienen" + +#: searx/templates/courgette/preferences.html:100 +#: searx/templates/legacy/preferences.html:97 +#: searx/templates/oscar/preferences.html:162 +#: searx/templates/oscar/preferences.html:176 +#: searx/templates/pix-art/preferences.html:53 +#: searx/templates/simple/preferences.html:87 +msgid "Engine name" +msgstr "Naam zoekmachien" + +#: searx/templates/courgette/preferences.html:101 +#: searx/templates/legacy/preferences.html:98 +msgid "Category" +msgstr "Categorie" + +#: searx/templates/courgette/preferences.html:102 +#: searx/templates/courgette/preferences.html:113 +#: searx/templates/legacy/preferences.html:99 +#: searx/templates/legacy/preferences.html:110 +#: searx/templates/oscar/preferences.html:161 +#: searx/templates/oscar/preferences.html:177 +#: searx/templates/pix-art/preferences.html:54 +#: searx/templates/pix-art/preferences.html:64 +#: searx/templates/simple/preferences.html:86 +msgid "Allow" +msgstr "Toestaan" + +#: searx/templates/courgette/preferences.html:102 +#: searx/templates/courgette/preferences.html:114 +#: searx/templates/legacy/preferences.html:99 +#: searx/templates/legacy/preferences.html:111 +#: searx/templates/pix-art/preferences.html:54 +#: searx/templates/pix-art/preferences.html:65 +msgid "Block" +msgstr "Blokkeren" + +#: searx/templates/courgette/preferences.html:122 +#: searx/templates/legacy/preferences.html:119 +#: searx/templates/oscar/preferences.html:297 +#: searx/templates/pix-art/preferences.html:73 +#: searx/templates/simple/preferences.html:180 +msgid "" +"These settings are stored in your cookies, this allows us not to store this " +"data about you." +msgstr "Deze instellingen worden bewaard in uw cookies. Hierdoor hoeven wij niks over u te bewaren." + +#: searx/templates/courgette/preferences.html:124 +#: searx/templates/legacy/preferences.html:121 +#: searx/templates/oscar/preferences.html:299 +#: searx/templates/pix-art/preferences.html:75 +#: searx/templates/simple/preferences.html:182 +msgid "" +"These cookies serve your sole convenience, we don't use these cookies to " +"track you." +msgstr "Deze cookies zijn alleen voor uw eigen gemak, we gebruiken deze cookies niet voor u te volgen." + +#: searx/templates/courgette/preferences.html:127 +#: searx/templates/legacy/preferences.html:124 +#: searx/templates/oscar/preferences.html:305 +#: searx/templates/pix-art/preferences.html:78 +#: searx/templates/simple/preferences.html:185 +msgid "save" +msgstr "opslaan" + +#: searx/templates/courgette/preferences.html:128 +#: searx/templates/legacy/preferences.html:125 +#: searx/templates/oscar/preferences.html:307 +#: searx/templates/simple/preferences.html:186 +msgid "Reset defaults" +msgstr "Standaardinstellingen herstellen" + +#: searx/templates/courgette/preferences.html:129 +#: searx/templates/legacy/preferences.html:126 +#: searx/templates/oscar/preferences.html:306 +#: searx/templates/pix-art/preferences.html:79 +#: searx/templates/simple/preferences.html:187 +msgid "back" +msgstr "terug" + +#: searx/templates/courgette/results.html:12 +#: searx/templates/legacy/results.html:13 +#: searx/templates/oscar/results.html:136 +#: searx/templates/simple/results.html:58 +msgid "Search URL" +msgstr "Zoek-URL" + +#: searx/templates/courgette/results.html:16 +#: searx/templates/legacy/results.html:17 +#: searx/templates/oscar/results.html:141 +#: searx/templates/simple/results.html:62 +msgid "Download results" +msgstr "Zoekresultaten downloaden" + +#: searx/templates/courgette/results.html:34 +#: searx/templates/legacy/results.html:35 +#: searx/templates/simple/results.html:10 +msgid "Answers" +msgstr "Antwoorden" + +#: searx/templates/courgette/results.html:42 +#: searx/templates/legacy/results.html:43 +#: searx/templates/oscar/results.html:116 +#: searx/templates/simple/results.html:42 +msgid "Suggestions" +msgstr "Suggesties" + +#: searx/templates/courgette/results.html:70 +#: searx/templates/legacy/results.html:81 +#: searx/templates/oscar/results.html:68 searx/templates/oscar/results.html:78 +#: searx/templates/simple/results.html:130 +msgid "previous page" +msgstr "vorige pagina" + +#: searx/templates/courgette/results.html:81 +#: searx/templates/legacy/results.html:92 +#: searx/templates/oscar/results.html:62 searx/templates/oscar/results.html:84 +#: searx/templates/simple/results.html:145 +msgid "next page" +msgstr "volgende pagina" + +#: searx/templates/courgette/search.html:3 +#: searx/templates/legacy/search.html:3 searx/templates/oscar/search.html:6 +#: searx/templates/oscar/search_full.html:9 +#: searx/templates/pix-art/search.html:3 searx/templates/simple/search.html:4 +msgid "Search for..." +msgstr "Zoeken naar..." + +#: searx/templates/courgette/stats.html:4 searx/templates/legacy/stats.html:4 +#: searx/templates/oscar/stats.html:5 searx/templates/pix-art/stats.html:4 +#: searx/templates/simple/stats.html:7 +msgid "Engine stats" +msgstr "Zoekmachienstatistieken" + +#: searx/templates/courgette/result_templates/images.html:4 +#: searx/templates/legacy/result_templates/images.html:4 +#: searx/templates/pix-art/result_templates/images.html:4 +msgid "original context" +msgstr "oorspronkelijke context" + +#: searx/templates/courgette/result_templates/torrent.html:7 +#: searx/templates/legacy/result_templates/torrent.html:11 +#: searx/templates/oscar/result_templates/torrent.html:6 +#: searx/templates/simple/result_templates/torrent.html:9 +msgid "Seeder" +msgstr "Seeders" + +#: searx/templates/courgette/result_templates/torrent.html:7 +#: searx/templates/legacy/result_templates/torrent.html:11 +#: searx/templates/oscar/result_templates/torrent.html:6 +#: searx/templates/simple/result_templates/torrent.html:9 +msgid "Leecher" +msgstr "Leechers" + +#: searx/templates/courgette/result_templates/torrent.html:9 +#: searx/templates/legacy/result_templates/torrent.html:9 +#: searx/templates/oscar/macros.html:23 +#: searx/templates/simple/result_templates/torrent.html:6 +msgid "magnet link" +msgstr "magneetkoppeling" + +#: searx/templates/courgette/result_templates/torrent.html:10 +#: searx/templates/legacy/result_templates/torrent.html:10 +#: searx/templates/oscar/macros.html:24 +#: searx/templates/simple/result_templates/torrent.html:7 +msgid "torrent file" +msgstr "torrentbestand" + +#: searx/templates/legacy/categories.html:8 +#: searx/templates/simple/categories.html:6 +msgid "Click on the magnifier to perform search" +msgstr "Klikt op het vergrootglas voor te zoeken" + +#: searx/templates/legacy/preferences.html:84 +#: searx/templates/oscar/preferences.html:113 +#: searx/templates/simple/preferences.html:142 +msgid "Results on new tabs" +msgstr "Resultaten op nieuwe tabbladen" + +#: searx/templates/legacy/preferences.html:87 +#: searx/templates/oscar/preferences.html:117 +#: searx/templates/simple/preferences.html:145 +msgid "On" +msgstr "Aan" + +#: searx/templates/legacy/preferences.html:88 +#: searx/templates/oscar/preferences.html:118 +#: searx/templates/simple/preferences.html:146 +msgid "Off" +msgstr "Uit" + +#: searx/templates/legacy/result_templates/code.html:3 +#: searx/templates/legacy/result_templates/default.html:3 +#: searx/templates/legacy/result_templates/map.html:9 +#: searx/templates/oscar/macros.html:34 searx/templates/oscar/macros.html:48 +#: searx/templates/simple/macros.html:43 +msgid "cached" +msgstr "gecachet" + +#: searx/templates/oscar/advanced.html:4 +msgid "Advanced settings" +msgstr "Geavanceerde instellingen" + +#: searx/templates/oscar/base.html:62 +#: searx/templates/oscar/messages/first_time.html:4 +#: searx/templates/oscar/messages/save_settings_successfull.html:5 +#: searx/templates/oscar/messages/unknow_error.html:5 +msgid "Close" +msgstr "Sluiten" + +#: searx/templates/oscar/base.html:64 +#: searx/templates/oscar/messages/no_results.html:4 +#: searx/templates/simple/messages/no_results.html:4 +#: searx/templates/simple/results.html:25 +msgid "Error!" +msgstr "Fout!" + +#: searx/templates/oscar/base.html:90 searx/templates/simple/base.html:55 +msgid "Powered by" +msgstr "Aangedreven door" + +#: searx/templates/oscar/base.html:90 searx/templates/simple/base.html:55 +msgid "a privacy-respecting, hackable metasearch engine" +msgstr "een privacyrespecterend, aanpasbaar metazoekmachien" + +#: searx/templates/oscar/macros.html:36 searx/templates/oscar/macros.html:50 +#: searx/templates/simple/macros.html:43 +msgid "proxied" +msgstr "geproxyt" + +#: searx/templates/oscar/macros.html:92 +msgid "supported" +msgstr "ondersteund" + +#: searx/templates/oscar/macros.html:96 +msgid "not supported" +msgstr "niet ondersteund" + +#: searx/templates/oscar/preferences.html:13 +#: searx/templates/oscar/preferences.html:22 +#: searx/templates/simple/preferences.html:32 +msgid "General" +msgstr "Algemeen" + +#: searx/templates/oscar/preferences.html:14 +#: searx/templates/oscar/preferences.html:146 +#: searx/templates/simple/preferences.html:76 +msgid "Engines" +msgstr "Zoekmachienen" + +#: searx/templates/oscar/preferences.html:15 +#: searx/templates/oscar/preferences.html:219 +msgid "Plugins" +msgstr "Plug-ins" + +#: searx/templates/oscar/preferences.html:16 +#: searx/templates/oscar/preferences.html:245 +msgid "Answerers" +msgstr "Beantwoorders" + +#: searx/templates/oscar/preferences.html:17 +#: searx/templates/oscar/preferences.html:272 +msgid "Cookies" +msgstr "Cookies" + +#: searx/templates/oscar/preferences.html:42 +#: searx/templates/simple/preferences.html:48 +msgid "What language do you prefer for search?" +msgstr "Welke taal wilt ge gebruiken voor het zoeken?" + +#: searx/templates/oscar/preferences.html:48 +#: searx/templates/simple/preferences.html:128 +msgid "Change the language of the layout" +msgstr "Wijzigt de taal van den opmaak" + +#: searx/templates/oscar/preferences.html:58 +#: searx/templates/simple/preferences.html:60 +msgid "Find stuff as you type" +msgstr "Zoekt tijdens het typen" + +#: searx/templates/oscar/preferences.html:69 +#: searx/templates/simple/preferences.html:173 +msgid "Proxying image results through searx" +msgstr "Afbeeldingsresultaten via searx laden" + +#: searx/templates/oscar/preferences.html:78 +msgid "" +"Change how forms are submited, <a " +"href=\"http://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods\"" +" rel=\"external\">learn more about request methods</a>" +msgstr "Bepaalt hoe dat de formulieren worden ingestuurd, <a href=\"http://nl.wikipedia.org/wiki/Hypertext_Transfer_Protocol#HTTP-requests\" rel=\"external\">leest meer over opvraagmethodes</a>" + +#: searx/templates/oscar/preferences.html:87 +#: searx/templates/simple/preferences.html:71 +msgid "Filter content" +msgstr "Filteren op inhoud" + +#: searx/templates/oscar/preferences.html:97 +#: searx/templates/simple/preferences.html:139 +msgid "Change searx layout" +msgstr "Opmaak van searx aanpassen" + +#: searx/templates/oscar/preferences.html:106 +#: searx/templates/oscar/preferences.html:111 +msgid "Choose style for this theme" +msgstr "Kiest ne stijl voor dit thema" + +#: searx/templates/oscar/preferences.html:106 +#: searx/templates/oscar/preferences.html:111 +msgid "Style" +msgstr "Stijl" + +#: searx/templates/oscar/preferences.html:122 +msgid "Open Access DOI resolver" +msgstr "Open Access DOI herschrijven" + +#: searx/templates/oscar/preferences.html:123 +msgid "" +"Redirect to open-access versions of publications when available (plugin " +"required)" +msgstr "Doorverwijzen naar vrij toegankelijke versies van publicaties, indien beschikbaar (plug-in vereist)" + +#: searx/templates/oscar/preferences.html:163 +#: searx/templates/oscar/preferences.html:175 +#: searx/templates/simple/preferences.html:88 +msgid "Shortcut" +msgstr "Snelkoppeling" + +#: searx/templates/oscar/preferences.html:164 +#: searx/templates/oscar/preferences.html:174 +msgid "Selected language" +msgstr "Geselecteerde taal" + +#: searx/templates/oscar/preferences.html:166 +#: searx/templates/oscar/preferences.html:172 +#: searx/templates/simple/preferences.html:91 +msgid "Time range" +msgstr "Tijdspanne" + +#: searx/templates/oscar/preferences.html:167 +#: searx/templates/oscar/preferences.html:171 +#: searx/templates/simple/preferences.html:92 +msgid "Avg. time" +msgstr "Gem. duur" + +#: searx/templates/oscar/preferences.html:168 +#: searx/templates/oscar/preferences.html:170 +#: searx/templates/simple/preferences.html:93 +msgid "Max time" +msgstr "Max. duur" + +#: searx/templates/oscar/preferences.html:248 +msgid "This is the list of searx's instant answering modules." +msgstr "Dit is het overzicht van de instantantwoordmodules van searx." + +#: searx/templates/oscar/preferences.html:252 +msgid "Name" +msgstr "Naam" + +#: searx/templates/oscar/preferences.html:253 +msgid "Keywords" +msgstr "Kernwoorden" + +#: searx/templates/oscar/preferences.html:254 +msgid "Description" +msgstr "Beschrijving" + +#: searx/templates/oscar/preferences.html:255 +msgid "Examples" +msgstr "Voorbeelden" + +#: searx/templates/oscar/preferences.html:275 +msgid "" +"This is the list of cookies and their values searx is storing on your " +"computer." +msgstr "Dit is de lijst van cookies en hun waarden die searx op uwe computer opslaat." + +#: searx/templates/oscar/preferences.html:276 +msgid "With that list, you can assess searx transparency." +msgstr "Met deze lijst kunt ge de openheid van searx beoordelen." + +#: searx/templates/oscar/preferences.html:281 +msgid "Cookie name" +msgstr "Cookienaam" + +#: searx/templates/oscar/preferences.html:282 +msgid "Value" +msgstr "Waarde" + +#: searx/templates/oscar/preferences.html:301 +msgid "Search URL of the currently saved preferences" +msgstr "Zoek-URL van de momenteel opgeslagen voorkeuren" + +#: searx/templates/oscar/preferences.html:301 +msgid "" +"Note: specifying custom settings in the search URL can reduce privacy by " +"leaking data to the clicked result sites." +msgstr "Let op: aangepaste instellingen opgeven in de zoek-URL kan nadelig zijn voor uw privacy, omdat het gegevens lekt aan de aangeklikte resultaatwebsites." + +#: searx/templates/oscar/results.html:17 +msgid "Search results" +msgstr "Zoekresultaten" + +#: searx/templates/oscar/results.html:21 +#: searx/templates/simple/results.html:84 +msgid "Try searching for:" +msgstr "Probeert te zoeken naar:" + +#: searx/templates/oscar/results.html:100 +#: searx/templates/simple/results.html:25 +msgid "Engines cannot retrieve results" +msgstr "Zoekmachienen konden geen resultaten ophalen" + +#: searx/templates/oscar/results.html:131 +msgid "Links" +msgstr "Koppelingen" + +#: searx/templates/oscar/search.html:8 +#: searx/templates/oscar/search_full.html:11 +#: searx/templates/simple/search.html:5 +msgid "Start search" +msgstr "Start zoeken" + +#: searx/templates/oscar/stats.html:2 +msgid "stats" +msgstr "stats" + +#: searx/templates/oscar/time-range.html:3 +#: searx/templates/simple/time-range.html:3 +msgid "Anytime" +msgstr "Altijd" + +#: searx/templates/oscar/time-range.html:6 +#: searx/templates/simple/time-range.html:6 +msgid "Last day" +msgstr "Voorbijen dag" + +#: searx/templates/oscar/time-range.html:9 +#: searx/templates/simple/time-range.html:9 +msgid "Last week" +msgstr "Voorbije week" + +#: searx/templates/oscar/time-range.html:12 +#: searx/templates/simple/time-range.html:12 +msgid "Last month" +msgstr "Voorbije maand" + +#: searx/templates/oscar/time-range.html:15 +#: searx/templates/simple/time-range.html:15 +msgid "Last year" +msgstr "Voorbije jaar" + +#: searx/templates/oscar/messages/first_time.html:6 +#: searx/templates/oscar/messages/no_data_available.html:3 +msgid "Heads up!" +msgstr "Opgelet!" + +#: searx/templates/oscar/messages/first_time.html:7 +msgid "It look like you are using searx first time." +msgstr "Het lijkt erop dat ge searx voor den eerste keer gebruikt." + +#: searx/templates/oscar/messages/no_cookies.html:3 +msgid "Information!" +msgstr "Informatie!" + +#: searx/templates/oscar/messages/no_cookies.html:4 +msgid "currently, there are no cookies defined." +msgstr "der zijn momenteel geen cookies gedefinieerd." + +#: searx/templates/oscar/messages/no_data_available.html:4 +msgid "There is currently no data available. " +msgstr "Der zijn momenteel geen gegevens beschikbaar." + +#: searx/templates/oscar/messages/no_results.html:4 +#: searx/templates/simple/messages/no_results.html:4 +msgid "Engines cannot retrieve results." +msgstr "Zoekmachinen konden geen resultaten ophalen." + +#: searx/templates/oscar/messages/no_results.html:10 +#: searx/templates/simple/messages/no_results.html:10 +msgid "Please, try again later or find another searx instance." +msgstr "Probeert het later opnieuw, of gebruikt een andere instantie van searx." + +#: searx/templates/oscar/messages/no_results.html:14 +#: searx/templates/simple/messages/no_results.html:14 +msgid "Sorry!" +msgstr "Sorry!" + +#: searx/templates/oscar/messages/no_results.html:15 +#: searx/templates/simple/messages/no_results.html:15 +msgid "" +"we didn't find any results. Please use another query or search in more " +"categories." +msgstr "We konden geen resultaten vinden. Probeert nen andere zoekopdracht, of zoekt in meer categorieën." + +#: searx/templates/oscar/messages/save_settings_successfull.html:7 +msgid "Well done!" +msgstr "Goed gedaan!" + +#: searx/templates/oscar/messages/save_settings_successfull.html:8 +msgid "Settings saved successfully." +msgstr "Instellingen opgeslagen." + +#: searx/templates/oscar/messages/unknow_error.html:7 +msgid "Oh snap!" +msgstr "Oeps!" + +#: searx/templates/oscar/messages/unknow_error.html:8 +msgid "Something went wrong." +msgstr "Der is iets misgegaan." + +#: searx/templates/oscar/result_templates/default.html:7 +#: searx/templates/simple/result_templates/default.html:6 +msgid "show media" +msgstr "media tonen" + +#: searx/templates/oscar/result_templates/default.html:7 +#: searx/templates/simple/result_templates/default.html:6 +msgid "hide media" +msgstr "media verbergen" + +#: searx/templates/oscar/result_templates/images.html:30 +msgid "Get image" +msgstr "Afbeelding tonen" + +#: searx/templates/oscar/result_templates/images.html:33 +msgid "View source" +msgstr "Bron bekijken" + +#: searx/templates/oscar/result_templates/map.html:7 +#: searx/templates/simple/result_templates/map.html:7 +msgid "show map" +msgstr "kaart tonen" + +#: searx/templates/oscar/result_templates/map.html:7 +#: searx/templates/simple/result_templates/map.html:7 +msgid "hide map" +msgstr "kaart verbergen" + +#: searx/templates/oscar/result_templates/map.html:11 +#: searx/templates/simple/result_templates/map.html:11 +msgid "show details" +msgstr "details tonen" + +#: searx/templates/oscar/result_templates/map.html:11 +#: searx/templates/simple/result_templates/map.html:11 +msgid "hide details" +msgstr "details verbergen" + +#: searx/templates/oscar/result_templates/torrent.html:7 +#: searx/templates/simple/result_templates/torrent.html:11 +msgid "Filesize" +msgstr "Bestandsgrootte" + +#: searx/templates/oscar/result_templates/torrent.html:9 +#: searx/templates/simple/result_templates/torrent.html:12 +msgid "Bytes" +msgstr "Bytes" + +#: searx/templates/oscar/result_templates/torrent.html:10 +#: searx/templates/simple/result_templates/torrent.html:13 +msgid "kiB" +msgstr "kiB" + +#: searx/templates/oscar/result_templates/torrent.html:11 +#: searx/templates/simple/result_templates/torrent.html:14 +msgid "MiB" +msgstr "MiB" + +#: searx/templates/oscar/result_templates/torrent.html:12 +#: searx/templates/simple/result_templates/torrent.html:15 +msgid "GiB" +msgstr "GiB" + +#: searx/templates/oscar/result_templates/torrent.html:13 +#: searx/templates/simple/result_templates/torrent.html:16 +msgid "TiB" +msgstr "TiB" + +#: searx/templates/oscar/result_templates/torrent.html:15 +#: searx/templates/simple/result_templates/torrent.html:20 +msgid "Number of Files" +msgstr "Aantal bestanden" + +#: searx/templates/oscar/result_templates/videos.html:7 +#: searx/templates/simple/result_templates/videos.html:6 +msgid "show video" +msgstr "video tonen" + +#: searx/templates/oscar/result_templates/videos.html:7 +#: searx/templates/simple/result_templates/videos.html:6 +msgid "hide video" +msgstr "video verbergen" + +#: searx/templates/pix-art/results.html:28 +msgid "Load more..." +msgstr "Meer laden…" + +#: searx/templates/simple/base.html:31 +msgid "No item found" +msgstr "Geen resultaat gevonden" + +#: searx/templates/simple/preferences.html:89 +msgid "Supports selected language" +msgstr "Ondersteunt geselecteerde taal" + +#: searx/templates/simple/preferences.html:118 +msgid "User interface" +msgstr "Gebruikersinterface" + +#: searx/templates/simple/preferences.html:154 +msgid "Privacy" +msgstr "Privacy" diff --git a/searx/translations/pl/LC_MESSAGES/messages.mo b/searx/translations/pl/LC_MESSAGES/messages.mo index d5c5f55efc..e4a4510131 100644 Binary files a/searx/translations/pl/LC_MESSAGES/messages.mo and b/searx/translations/pl/LC_MESSAGES/messages.mo differ diff --git a/searx/translations/pt/LC_MESSAGES/messages.mo b/searx/translations/pt/LC_MESSAGES/messages.mo index bbf2fba0fa..d88c449f1e 100644 Binary files a/searx/translations/pt/LC_MESSAGES/messages.mo and b/searx/translations/pt/LC_MESSAGES/messages.mo differ diff --git a/searx/translations/pt/LC_MESSAGES/messages.po b/searx/translations/pt/LC_MESSAGES/messages.po index 81ac6f5b9e..d8446731a5 100644 --- a/searx/translations/pt/LC_MESSAGES/messages.po +++ b/searx/translations/pt/LC_MESSAGES/messages.po @@ -4,13 +4,14 @@ # # Translators: # Dickprince, 2017 +# Chacal Exodius, 2018 msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" "POT-Creation-Date: 2017-11-01 21:31+0100\n" -"PO-Revision-Date: 2017-11-01 20:31+0000\n" -"Last-Translator: Adam Tauber <asciimoo@gmail.com>\n" +"PO-Revision-Date: 2018-12-26 22:43+0000\n" +"Last-Translator: Chacal Exodius\n" "Language-Team: Portuguese (http://www.transifex.com/asciimoo/searx/language/pt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,15 +22,15 @@ msgstr "" #: searx/search.py:137 searx/search.py:182 msgid "timeout" -msgstr "" +msgstr "tempo esgotado" #: searx/search.py:144 msgid "request exception" -msgstr "" +msgstr "solicitar exceção" #: searx/search.py:151 msgid "unexpected crash" -msgstr "" +msgstr "acidente inesperado" #: searx/webapp.py:136 msgid "files" @@ -77,7 +78,7 @@ msgstr "Definições inválidas, por favor edite as suas preferências" #: searx/webapp.py:415 msgid "Invalid settings" -msgstr "" +msgstr "Configurações inválidas" #: searx/webapp.py:449 searx/webapp.py:493 msgid "search error" @@ -143,7 +144,7 @@ msgstr "Esta entrada foi substituída por" #: searx/engines/pubmed.py:74 msgid "No abstract is available for this publication." -msgstr "" +msgstr "Nenhum resumo está disponível para esta publicação." #: searx/plugins/https_rewrite.py:32 msgid "Rewrite HTTP links to HTTPS if possible" @@ -159,7 +160,7 @@ msgstr "Carregar automaticamente a próxima página assim que se desloque para o #: searx/plugins/oa_doi_rewrite.py:9 msgid "Open Access DOI rewrite" -msgstr "" +msgstr "Reescrita DOI de acesso aberto" #: searx/plugins/oa_doi_rewrite.py:10 msgid "" @@ -461,7 +462,7 @@ msgstr "Estes cookies servem somente para sua conveniência, não os utilizamos #: searx/templates/pix-art/preferences.html:78 #: searx/templates/simple/preferences.html:185 msgid "save" -msgstr "guardar" +msgstr "Guardar" #: searx/templates/courgette/preferences.html:128 #: searx/templates/legacy/preferences.html:125 @@ -476,7 +477,7 @@ msgstr "Repor predefinições" #: searx/templates/pix-art/preferences.html:79 #: searx/templates/simple/preferences.html:187 msgid "back" -msgstr "atrás" +msgstr "Atrás" #: searx/templates/courgette/results.html:12 #: searx/templates/legacy/results.html:13 @@ -630,11 +631,11 @@ msgstr "via proxy" #: searx/templates/oscar/macros.html:92 msgid "supported" -msgstr "" +msgstr "suportado" #: searx/templates/oscar/macros.html:96 msgid "not supported" -msgstr "" +msgstr "não suportado" #: searx/templates/oscar/preferences.html:13 #: searx/templates/oscar/preferences.html:22 @@ -712,13 +713,13 @@ msgstr "Estilo" #: searx/templates/oscar/preferences.html:122 msgid "Open Access DOI resolver" -msgstr "" +msgstr "Resolvedor DOI de Acesso Aberto" #: searx/templates/oscar/preferences.html:123 msgid "" "Redirect to open-access versions of publications when available (plugin " "required)" -msgstr "" +msgstr "Redirecionar para versões de acesso aberto de publicações quando disponíveis (requer plug-in)" #: searx/templates/oscar/preferences.html:163 #: searx/templates/oscar/preferences.html:175 @@ -729,7 +730,7 @@ msgstr "Atalho" #: searx/templates/oscar/preferences.html:164 #: searx/templates/oscar/preferences.html:174 msgid "Selected language" -msgstr "" +msgstr "Idioma selecionado" #: searx/templates/oscar/preferences.html:166 #: searx/templates/oscar/preferences.html:172 @@ -789,13 +790,13 @@ msgstr "Valor" #: searx/templates/oscar/preferences.html:301 msgid "Search URL of the currently saved preferences" -msgstr "" +msgstr "URL de pesquisa das preferências salvas atualmente" #: searx/templates/oscar/preferences.html:301 msgid "" "Note: specifying custom settings in the search URL can reduce privacy by " "leaking data to the clicked result sites." -msgstr "" +msgstr "Nota: a especificação de configurações personalizadas no URL de pesquisa pode reduzir a privacidade ao vazar dados para os sites de resultados clicados." #: searx/templates/oscar/results.html:17 msgid "Search results" @@ -804,12 +805,12 @@ msgstr "Resultados de pesquisa" #: searx/templates/oscar/results.html:21 #: searx/templates/simple/results.html:84 msgid "Try searching for:" -msgstr "" +msgstr "Tente pesquisar por:" #: searx/templates/oscar/results.html:100 #: searx/templates/simple/results.html:25 msgid "Engines cannot retrieve results" -msgstr "" +msgstr "Mecanismos não podem recuperar resultados" #: searx/templates/oscar/results.html:131 msgid "Links" @@ -874,12 +875,12 @@ msgstr "Não existem dados disponíveis." #: searx/templates/oscar/messages/no_results.html:4 #: searx/templates/simple/messages/no_results.html:4 msgid "Engines cannot retrieve results." -msgstr "" +msgstr "Mecanismos não podem recuperar resultados." #: searx/templates/oscar/messages/no_results.html:10 #: searx/templates/simple/messages/no_results.html:10 msgid "Please, try again later or find another searx instance." -msgstr "" +msgstr "Por favor, tente novamente mais tarde ou encontre outra ocorrência de searx." #: searx/templates/oscar/messages/no_results.html:14 #: searx/templates/simple/messages/no_results.html:14 @@ -998,7 +999,7 @@ msgstr "Carregar mais..." #: searx/templates/simple/base.html:31 msgid "No item found" -msgstr "" +msgstr "Nenhum item encontrado" #: searx/templates/simple/preferences.html:89 msgid "Supports selected language" @@ -1006,8 +1007,8 @@ msgstr "Suporta idioma selecionado" #: searx/templates/simple/preferences.html:118 msgid "User interface" -msgstr "" +msgstr "Interface de usuário" #: searx/templates/simple/preferences.html:154 msgid "Privacy" -msgstr "" +msgstr "Privacidade" diff --git a/searx/translations/pt_BR/LC_MESSAGES/messages.mo b/searx/translations/pt_BR/LC_MESSAGES/messages.mo index a169ac908f..03eb74f4ef 100644 Binary files a/searx/translations/pt_BR/LC_MESSAGES/messages.mo and b/searx/translations/pt_BR/LC_MESSAGES/messages.mo differ diff --git a/searx/translations/pt_BR/LC_MESSAGES/messages.po b/searx/translations/pt_BR/LC_MESSAGES/messages.po index b5a786c70c..6a0a6b8374 100644 --- a/searx/translations/pt_BR/LC_MESSAGES/messages.po +++ b/searx/translations/pt_BR/LC_MESSAGES/messages.po @@ -4,6 +4,7 @@ # # Translators: # Adam Tauber <asciimoo@gmail.com>, 2017 +# Chacal Exodius, 2018 # Gabriel Nunes <gabriel.hkr@gmail.com>, 2017 # Guimarães Mello <maeslor@cryptolab.net>, 2017 # Neton Brício <fervelinux@gmail.com>, 2015 @@ -14,8 +15,8 @@ msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" "POT-Creation-Date: 2017-11-01 21:31+0100\n" -"PO-Revision-Date: 2018-03-03 12:33+0000\n" -"Last-Translator: shizuka\n" +"PO-Revision-Date: 2018-08-06 05:21+0000\n" +"Last-Translator: Chacal Exodius\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/asciimoo/searx/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -164,7 +165,7 @@ msgstr "Automaticamente carregar a próxima página quando ir até o fim da pág #: searx/plugins/oa_doi_rewrite.py:9 msgid "Open Access DOI rewrite" -msgstr "" +msgstr "Reescrita DOI de acesso aberto" #: searx/plugins/oa_doi_rewrite.py:10 msgid "" @@ -717,7 +718,7 @@ msgstr "Estilo" #: searx/templates/oscar/preferences.html:122 msgid "Open Access DOI resolver" -msgstr "" +msgstr "Resolvedor DOI de Acesso Aberto" #: searx/templates/oscar/preferences.html:123 msgid "" diff --git a/searx/translations/ro/LC_MESSAGES/messages.mo b/searx/translations/ro/LC_MESSAGES/messages.mo index 5c6714e939..f39068576a 100644 Binary files a/searx/translations/ro/LC_MESSAGES/messages.mo and b/searx/translations/ro/LC_MESSAGES/messages.mo differ diff --git a/searx/translations/ro/LC_MESSAGES/messages.po b/searx/translations/ro/LC_MESSAGES/messages.po index 21a2e7d1d5..7cfd1be37f 100644 --- a/searx/translations/ro/LC_MESSAGES/messages.po +++ b/searx/translations/ro/LC_MESSAGES/messages.po @@ -4,13 +4,14 @@ # # Translators: # adrian.fita <adrian.fita@gmail.com>, 2015 +# Daniel Șerbănescu <daniel@serbanescu.dk>, 2018 msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" "POT-Creation-Date: 2017-11-01 21:31+0100\n" -"PO-Revision-Date: 2017-11-01 20:31+0000\n" -"Last-Translator: Adam Tauber <asciimoo@gmail.com>\n" +"PO-Revision-Date: 2018-11-15 21:18+0000\n" +"Last-Translator: Daniel Șerbănescu <daniel@serbanescu.dk>\n" "Language-Team: Romanian (http://www.transifex.com/asciimoo/searx/language/ro/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,15 +22,15 @@ msgstr "" #: searx/search.py:137 searx/search.py:182 msgid "timeout" -msgstr "" +msgstr "timp alocat expirat" #: searx/search.py:144 msgid "request exception" -msgstr "" +msgstr "excepție la cerere" #: searx/search.py:151 msgid "unexpected crash" -msgstr "" +msgstr "terminare prematură neașteptată" #: searx/webapp.py:136 msgid "files" @@ -37,7 +38,7 @@ msgstr "fișiere" #: searx/webapp.py:137 msgid "general" -msgstr "general" +msgstr "generale" #: searx/webapp.py:138 msgid "music" @@ -57,7 +58,7 @@ msgstr "videouri" #: searx/webapp.py:142 msgid "it" -msgstr "el(ea)" +msgstr "informatică" #: searx/webapp.py:143 msgid "news" @@ -65,23 +66,23 @@ msgstr "știri" #: searx/webapp.py:144 msgid "map" -msgstr "hartă" +msgstr "hărți" #: searx/webapp.py:145 msgid "science" -msgstr "" +msgstr "știință" #: searx/webapp.py:399 searx/webapp.py:658 msgid "Invalid settings, please edit your preferences" -msgstr "" +msgstr "Configurări nevalide, editați preferințele" #: searx/webapp.py:415 msgid "Invalid settings" -msgstr "" +msgstr "Configurări nevalide" #: searx/webapp.py:449 searx/webapp.py:493 msgid "search error" -msgstr "" +msgstr "eroare de căutare" #: searx/webapp.py:530 msgid "{minutes} minute(s) ago" @@ -93,27 +94,27 @@ msgstr "{hours} oră(e), {minutes} minut(e) în urmă" #: searx/answerers/random/answerer.py:53 msgid "Random value generator" -msgstr "" +msgstr "Generator de valori aleatorii" #: searx/answerers/random/answerer.py:54 msgid "Generate different random values" -msgstr "" +msgstr "Generează valori aleatoare diferite" #: searx/answerers/statistics/answerer.py:53 msgid "Statistics functions" -msgstr "" +msgstr "Funcții statistice" #: searx/answerers/statistics/answerer.py:54 msgid "Compute {functions} of the arguments" -msgstr "" +msgstr "Calculează {functions} din argumente" #: searx/engines/__init__.py:194 searx/engines/flycheck___init__.py:201 msgid "Engine time (sec)" -msgstr "" +msgstr "Timpul motorului (sec)" #: searx/engines/__init__.py:198 searx/engines/flycheck___init__.py:205 msgid "Page loads (sec)" -msgstr "Încărcarea paginilor (sec)" +msgstr "Încărcarea paginii (sec)" #: searx/engines/__init__.py:202 searx/engines/flycheck___init__.py:209 #: searx/templates/oscar/results.html:95 @@ -135,15 +136,15 @@ msgstr "Erori" #: searx/engines/pdbe.py:87 msgid "{title} (OBSOLETE)" -msgstr "" +msgstr "{title} (ÎNVECHIT)" #: searx/engines/pdbe.py:91 msgid "This entry has been superseded by" -msgstr "" +msgstr "Această intrare a fost perimată de" #: searx/engines/pubmed.py:74 msgid "No abstract is available for this publication." -msgstr "" +msgstr "Niciun abstract disponibil pentru această publicație." #: searx/plugins/https_rewrite.py:32 msgid "Rewrite HTTP links to HTTPS if possible" @@ -151,86 +152,86 @@ msgstr "Rescrie legăturile HTTP cu HTTPS dacă e posibil" #: searx/plugins/infinite_scroll.py:3 msgid "Infinite scroll" -msgstr "" +msgstr "Derulare infinită" #: searx/plugins/infinite_scroll.py:4 msgid "Automatically load next page when scrolling to bottom of current page" -msgstr "" +msgstr "Încarcă automat pagina următoare când se derulează la baza paginii curente" #: searx/plugins/oa_doi_rewrite.py:9 msgid "Open Access DOI rewrite" -msgstr "" +msgstr "Rescriere către acces deschis DOI" #: searx/plugins/oa_doi_rewrite.py:10 msgid "" "Avoid paywalls by redirecting to open-access versions of publications when " "available" -msgstr "" +msgstr "Evită „zidurile de plată” redirecționând către versiuni cu acces deschis ale publicațiilor când sunt disponibile" #: searx/plugins/open_results_on_new_tab.py:18 #: searx/templates/oscar/preferences.html:114 #: searx/templates/simple/preferences.html:149 msgid "Open result links on new browser tabs" -msgstr "" +msgstr "Deschide legăturile rezultate în taburi noi" #: searx/plugins/open_results_on_new_tab.py:19 msgid "" "Results are opened in the same window by default. This plugin overwrites the" " default behaviour to open links on new tabs/windows. (JavaScript required)" -msgstr "" +msgstr "Rezultatele sunt deschise în aceeași fereastră în mod implicit. Acest modul suprascrie acțiunea implicită de a deschide legături în ferestre/taburi noi. (Necesită JavaScript)" #: searx/plugins/search_on_category_select.py:18 msgid "Search on category select" -msgstr "Căutare în categoria selectată" +msgstr "Caută la selectarea categoriei" #: searx/plugins/search_on_category_select.py:19 msgid "" "Perform search immediately if a category selected. Disable to select " "multiple categories. (JavaScript required)" -msgstr "" +msgstr "Execută căutarea imediat dacă o categorie este selectată. Dezactivează pentru a selecta categorii multiple. (Necesită JavaScript)" #: searx/plugins/self_info.py:20 msgid "" "Displays your IP if the query is \"ip\" and your user agent if the query " "contains \"user agent\"." -msgstr "" +msgstr "Afișează IP-ul dacă interogarea este „ip” și agentul de utilizator dacă interogarea conține „user agent”." #: searx/plugins/tracker_url_remover.py:26 msgid "Tracker URL remover" -msgstr "" +msgstr "Eliminator de URL pentru urmăritor" #: searx/plugins/tracker_url_remover.py:27 msgid "Remove trackers arguments from the returned URL" -msgstr "" +msgstr "Elimină argumentele urmăritorului din URL-ul returnat" #: searx/plugins/vim_hotkeys.py:3 msgid "Vim-like hotkeys" -msgstr "" +msgstr "Scurtături de tastatură în stilul Vim" #: searx/plugins/vim_hotkeys.py:4 msgid "" "Navigate search results with Vim-like hotkeys (JavaScript required). Press " "\"h\" key on main or result page to get help." -msgstr "" +msgstr "Navighează rezultatele căutării cu scurtături de tastatură în stilul Vim (necesită JavaScript). Apăsați tasta „h” în pagina principală sau în pagina cu rezultate pentru a obține ajutor." #: searx/templates/courgette/404.html:4 searx/templates/legacy/404.html:4 #: searx/templates/oscar/404.html:4 searx/templates/pix-art/404.html:4 #: searx/templates/simple/404.html:4 msgid "Page not found" -msgstr "" +msgstr "Pagină negăsită" #: searx/templates/courgette/404.html:6 searx/templates/legacy/404.html:6 #: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 #: searx/templates/simple/404.html:6 #, python-format msgid "Go to %(search_page)s." -msgstr "" +msgstr "Navighează la %(search_page)s" #: searx/templates/courgette/404.html:6 searx/templates/legacy/404.html:6 #: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 #: searx/templates/simple/404.html:6 msgid "search page" -msgstr "" +msgstr "pagină de căutare" #: searx/templates/courgette/index.html:9 #: searx/templates/courgette/index.html:13 @@ -280,7 +281,7 @@ msgstr "Limba de căutare" #: searx/templates/simple/languages.html:2 #: searx/templates/simple/preferences.html:42 msgid "Default language" -msgstr "" +msgstr "Limba implicită" #: searx/templates/courgette/preferences.html:24 #: searx/templates/legacy/preferences.html:25 @@ -443,7 +444,7 @@ msgstr "Blochează" msgid "" "These settings are stored in your cookies, this allows us not to store this " "data about you." -msgstr "Aceste setări sunt stocate în cookie-urile d-voastră, aceasta ne permite să nu stocăm aceste date despre d-voastră." +msgstr "Aceste configurări sunt stocate în cookie-uri, ceea ce ne permite să nu stocăm aceste date despre dumeavoastră." #: searx/templates/courgette/preferences.html:124 #: searx/templates/legacy/preferences.html:121 @@ -453,7 +454,7 @@ msgstr "Aceste setări sunt stocate în cookie-urile d-voastră, aceasta ne perm msgid "" "These cookies serve your sole convenience, we don't use these cookies to " "track you." -msgstr "Aceste cookie-uri servesc doar pentru confortul d-voastră, noi nu stocăm aceste cookie-uri pentru a vă urmări." +msgstr "Aceste cookie-uri servesc doar pentru conveniența dumneavoastră, noi nu stocăm aceste cookie-uri pentru a vă urmări." #: searx/templates/courgette/preferences.html:127 #: searx/templates/legacy/preferences.html:124 @@ -468,7 +469,7 @@ msgstr "salvează" #: searx/templates/oscar/preferences.html:307 #: searx/templates/simple/preferences.html:186 msgid "Reset defaults" -msgstr "Resetează valorile implicite" +msgstr "Restabilește la valorile implicite" #: searx/templates/courgette/preferences.html:129 #: searx/templates/legacy/preferences.html:126 @@ -543,14 +544,14 @@ msgstr "contextul original" #: searx/templates/oscar/result_templates/torrent.html:6 #: searx/templates/simple/result_templates/torrent.html:9 msgid "Seeder" -msgstr "Seeder" +msgstr "Partener" #: searx/templates/courgette/result_templates/torrent.html:7 #: searx/templates/legacy/result_templates/torrent.html:11 #: searx/templates/oscar/result_templates/torrent.html:6 #: searx/templates/simple/result_templates/torrent.html:9 msgid "Leecher" -msgstr "Leecher" +msgstr "Sursă incompletă" #: searx/templates/courgette/result_templates/torrent.html:9 #: searx/templates/legacy/result_templates/torrent.html:9 @@ -575,19 +576,19 @@ msgstr "Apăsați pe lupă pentru a executa căutarea" #: searx/templates/oscar/preferences.html:113 #: searx/templates/simple/preferences.html:142 msgid "Results on new tabs" -msgstr "" +msgstr "Rezultate în taburi noi" #: searx/templates/legacy/preferences.html:87 #: searx/templates/oscar/preferences.html:117 #: searx/templates/simple/preferences.html:145 msgid "On" -msgstr "" +msgstr "Pornit" #: searx/templates/legacy/preferences.html:88 #: searx/templates/oscar/preferences.html:118 #: searx/templates/simple/preferences.html:146 msgid "Off" -msgstr "" +msgstr "Oprit" #: searx/templates/legacy/result_templates/code.html:3 #: searx/templates/legacy/result_templates/default.html:3 @@ -599,7 +600,7 @@ msgstr "stocat temporar" #: searx/templates/oscar/advanced.html:4 msgid "Advanced settings" -msgstr "" +msgstr "Configurări avansate" #: searx/templates/oscar/base.html:62 #: searx/templates/oscar/messages/first_time.html:4 @@ -613,7 +614,7 @@ msgstr "Închide" #: searx/templates/simple/messages/no_results.html:4 #: searx/templates/simple/results.html:25 msgid "Error!" -msgstr "" +msgstr "Eroare!" #: searx/templates/oscar/base.html:90 searx/templates/simple/base.html:55 msgid "Powered by" @@ -626,21 +627,21 @@ msgstr "un meta-motor de căutare care respectă confidențialitatea" #: searx/templates/oscar/macros.html:36 searx/templates/oscar/macros.html:50 #: searx/templates/simple/macros.html:43 msgid "proxied" -msgstr "" +msgstr "delegat" #: searx/templates/oscar/macros.html:92 msgid "supported" -msgstr "" +msgstr "suporat" #: searx/templates/oscar/macros.html:96 msgid "not supported" -msgstr "" +msgstr "nesuportat" #: searx/templates/oscar/preferences.html:13 #: searx/templates/oscar/preferences.html:22 #: searx/templates/simple/preferences.html:32 msgid "General" -msgstr "General" +msgstr "Generale" #: searx/templates/oscar/preferences.html:14 #: searx/templates/oscar/preferences.html:146 @@ -656,12 +657,12 @@ msgstr "Module" #: searx/templates/oscar/preferences.html:16 #: searx/templates/oscar/preferences.html:245 msgid "Answerers" -msgstr "" +msgstr "Răspunzători" #: searx/templates/oscar/preferences.html:17 #: searx/templates/oscar/preferences.html:272 msgid "Cookies" -msgstr "" +msgstr "Cookie-uri" #: searx/templates/oscar/preferences.html:42 #: searx/templates/simple/preferences.html:48 @@ -703,99 +704,99 @@ msgstr "Schimbă aspectul lui searx" #: searx/templates/oscar/preferences.html:106 #: searx/templates/oscar/preferences.html:111 msgid "Choose style for this theme" -msgstr "" +msgstr "Alegeți stilul pentru această temă" #: searx/templates/oscar/preferences.html:106 #: searx/templates/oscar/preferences.html:111 msgid "Style" -msgstr "" +msgstr "Stil" #: searx/templates/oscar/preferences.html:122 msgid "Open Access DOI resolver" -msgstr "" +msgstr "Rezolvator de acces deschis DOI" #: searx/templates/oscar/preferences.html:123 msgid "" "Redirect to open-access versions of publications when available (plugin " "required)" -msgstr "" +msgstr "Redirecționează către versiuni cu acces deschis ale publicațiilor când sunt disponibile (modul necesar)" #: searx/templates/oscar/preferences.html:163 #: searx/templates/oscar/preferences.html:175 #: searx/templates/simple/preferences.html:88 msgid "Shortcut" -msgstr "" +msgstr "Scurtătură" #: searx/templates/oscar/preferences.html:164 #: searx/templates/oscar/preferences.html:174 msgid "Selected language" -msgstr "" +msgstr "Limba selectată" #: searx/templates/oscar/preferences.html:166 #: searx/templates/oscar/preferences.html:172 #: searx/templates/simple/preferences.html:91 msgid "Time range" -msgstr "" +msgstr "Interval de timp" #: searx/templates/oscar/preferences.html:167 #: searx/templates/oscar/preferences.html:171 #: searx/templates/simple/preferences.html:92 msgid "Avg. time" -msgstr "" +msgstr "Timp mediu" #: searx/templates/oscar/preferences.html:168 #: searx/templates/oscar/preferences.html:170 #: searx/templates/simple/preferences.html:93 msgid "Max time" -msgstr "" +msgstr "Timp maxim" #: searx/templates/oscar/preferences.html:248 msgid "This is the list of searx's instant answering modules." -msgstr "" +msgstr "Aceasta este lista de module de răspundere instantă a lui searx." #: searx/templates/oscar/preferences.html:252 msgid "Name" -msgstr "" +msgstr "Nume" #: searx/templates/oscar/preferences.html:253 msgid "Keywords" -msgstr "" +msgstr "Cuvinte cheie" #: searx/templates/oscar/preferences.html:254 msgid "Description" -msgstr "" +msgstr "Descriere" #: searx/templates/oscar/preferences.html:255 msgid "Examples" -msgstr "" +msgstr "Exemple" #: searx/templates/oscar/preferences.html:275 msgid "" "This is the list of cookies and their values searx is storing on your " "computer." -msgstr "" +msgstr "Aceasta este lista de cookie-uri și valorile lor pe care searx le stochează pe calculatorul dumneavoastră." #: searx/templates/oscar/preferences.html:276 msgid "With that list, you can assess searx transparency." -msgstr "" +msgstr "Cu acea listă puteți evalua nivelul de transparență al lui searx." #: searx/templates/oscar/preferences.html:281 msgid "Cookie name" -msgstr "" +msgstr "Nume cookie" #: searx/templates/oscar/preferences.html:282 msgid "Value" -msgstr "" +msgstr "Valuare" #: searx/templates/oscar/preferences.html:301 msgid "Search URL of the currently saved preferences" -msgstr "" +msgstr "URL-ul de căutare al preferințelor salvate curent" #: searx/templates/oscar/preferences.html:301 msgid "" "Note: specifying custom settings in the search URL can reduce privacy by " "leaking data to the clicked result sites." -msgstr "" +msgstr "Notă: specificând configurări personalizate în URL-ul de căutare poate reduce nivelul de confidențialitate prin scurgerea datelor către siturile accesate la căutare." #: searx/templates/oscar/results.html:17 msgid "Search results" @@ -804,12 +805,12 @@ msgstr "Rezultatele căutării" #: searx/templates/oscar/results.html:21 #: searx/templates/simple/results.html:84 msgid "Try searching for:" -msgstr "" +msgstr "Încercați să căutați după:" #: searx/templates/oscar/results.html:100 #: searx/templates/simple/results.html:25 msgid "Engines cannot retrieve results" -msgstr "" +msgstr "Motoarele nu pot obține rezultate" #: searx/templates/oscar/results.html:131 msgid "Links" @@ -828,27 +829,27 @@ msgstr "statistici" #: searx/templates/oscar/time-range.html:3 #: searx/templates/simple/time-range.html:3 msgid "Anytime" -msgstr "" +msgstr "Oricând" #: searx/templates/oscar/time-range.html:6 #: searx/templates/simple/time-range.html:6 msgid "Last day" -msgstr "" +msgstr "Ultima zi" #: searx/templates/oscar/time-range.html:9 #: searx/templates/simple/time-range.html:9 msgid "Last week" -msgstr "" +msgstr "Ultima săptămână" #: searx/templates/oscar/time-range.html:12 #: searx/templates/simple/time-range.html:12 msgid "Last month" -msgstr "" +msgstr "Ultima lună" #: searx/templates/oscar/time-range.html:15 #: searx/templates/simple/time-range.html:15 msgid "Last year" -msgstr "" +msgstr "Ultimul an" #: searx/templates/oscar/messages/first_time.html:6 #: searx/templates/oscar/messages/no_data_available.html:3 @@ -861,11 +862,11 @@ msgstr "Se pare că folosiți searx pentru prima dată." #: searx/templates/oscar/messages/no_cookies.html:3 msgid "Information!" -msgstr "" +msgstr "Informație!" #: searx/templates/oscar/messages/no_cookies.html:4 msgid "currently, there are no cookies defined." -msgstr "" +msgstr "momentan, nu există cookie-uri definite" #: searx/templates/oscar/messages/no_data_available.html:4 msgid "There is currently no data available. " @@ -874,24 +875,24 @@ msgstr "Deocamdată nu există date disponibile." #: searx/templates/oscar/messages/no_results.html:4 #: searx/templates/simple/messages/no_results.html:4 msgid "Engines cannot retrieve results." -msgstr "" +msgstr "Motoarele nu pot obține rezultate" #: searx/templates/oscar/messages/no_results.html:10 #: searx/templates/simple/messages/no_results.html:10 msgid "Please, try again later or find another searx instance." -msgstr "" +msgstr "Încercați din nou mai târziu sau folosiți o altă instanță searx-" #: searx/templates/oscar/messages/no_results.html:14 #: searx/templates/simple/messages/no_results.html:14 msgid "Sorry!" -msgstr "Îmi pare rău!" +msgstr "Ne pare rău!" #: searx/templates/oscar/messages/no_results.html:15 #: searx/templates/simple/messages/no_results.html:15 msgid "" "we didn't find any results. Please use another query or search in more " "categories." -msgstr "n-am găsit nici un rezultat. Vă rog folosiți o altă interogare sau căutați în mai multe categorii." +msgstr "n-am găsit nici un rezultat. Folosiți o altă interogare sau căutați în mai multe categorii." #: searx/templates/oscar/messages/save_settings_successfull.html:7 msgid "Well done!" @@ -899,7 +900,7 @@ msgstr "Bravo!" #: searx/templates/oscar/messages/save_settings_successfull.html:8 msgid "Settings saved successfully." -msgstr "Setările au fost salvate cu succes." +msgstr "Configurările au fost salvate cu succes." #: searx/templates/oscar/messages/unknow_error.html:7 msgid "Oh snap!" @@ -998,16 +999,16 @@ msgstr "Încarcă mai multe..." #: searx/templates/simple/base.html:31 msgid "No item found" -msgstr "" +msgstr "Niciun element găsit" #: searx/templates/simple/preferences.html:89 msgid "Supports selected language" -msgstr "" +msgstr "Suportă limba selectată" #: searx/templates/simple/preferences.html:118 msgid "User interface" -msgstr "" +msgstr "Interfața pentru utilizator" #: searx/templates/simple/preferences.html:154 msgid "Privacy" -msgstr "" +msgstr "Confidențialitate" diff --git a/searx/translations/ru/LC_MESSAGES/messages.mo b/searx/translations/ru/LC_MESSAGES/messages.mo index 9d5ea61b08..c6bcdd1b6d 100644 Binary files a/searx/translations/ru/LC_MESSAGES/messages.mo and b/searx/translations/ru/LC_MESSAGES/messages.mo differ diff --git a/searx/translations/ru/LC_MESSAGES/messages.po b/searx/translations/ru/LC_MESSAGES/messages.po index f6bda5f1b6..befe7f963e 100644 --- a/searx/translations/ru/LC_MESSAGES/messages.po +++ b/searx/translations/ru/LC_MESSAGES/messages.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the PROJECT project. # # Translators: -# Andrey, 2017 +# Andrey, 2017-2019 # dimqua <dimqua@riseup.net>, 2015 # dimqua <dimqua@riseup.net>, 2015 # dimqua <dimqua@riseup.net>, 2017 @@ -14,8 +14,8 @@ msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" "POT-Creation-Date: 2017-11-01 21:31+0100\n" -"PO-Revision-Date: 2018-02-26 16:39+0000\n" -"Last-Translator: John DOe <is-kir@ya.ru>\n" +"PO-Revision-Date: 2019-01-05 12:11+0000\n" +"Last-Translator: Andrey\n" "Language-Team: Russian (http://www.transifex.com/asciimoo/searx/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -34,7 +34,7 @@ msgstr "ошибка выполнения запроса" #: searx/search.py:151 msgid "unexpected crash" -msgstr "неожиданное падение" +msgstr "неожиданный сбой" #: searx/webapp.py:136 msgid "files" @@ -148,7 +148,7 @@ msgstr "Эта запись была заменена на" #: searx/engines/pubmed.py:74 msgid "No abstract is available for this publication." -msgstr "Для данной публикации недоступно" +msgstr "Нет аннотации для этой публикации." #: searx/plugins/https_rewrite.py:32 msgid "Rewrite HTTP links to HTTPS if possible" @@ -198,15 +198,15 @@ msgstr "Выполнять поиск немедленно, если выбра msgid "" "Displays your IP if the query is \"ip\" and your user agent if the query " "contains \"user agent\"." -msgstr "Отображает ваш IP-адрес при запросе \"ip\" и отпечаток браузера при запросе \"user agent\"." +msgstr "Отображает ваш IP-адрес при запросе \"ip\" и пользовательский агент при запросе \"user agent\"." #: searx/plugins/tracker_url_remover.py:26 msgid "Tracker URL remover" -msgstr "Удаление трекера URL-адресов" +msgstr "Удаление трекинга URL-адресов" #: searx/plugins/tracker_url_remover.py:27 msgid "Remove trackers arguments from the returned URL" -msgstr "Удаляет аргументы отслеживания из возвращенного URL-адреса" +msgstr "Удаляет аргументы отслеживания из URL-адреса" #: searx/plugins/vim_hotkeys.py:3 msgid "Vim-like hotkeys" @@ -300,7 +300,7 @@ msgstr "Язык интерфейса" #: searx/templates/oscar/preferences.html:57 #: searx/templates/simple/preferences.html:51 msgid "Autocomplete" -msgstr "Подгрузка результатов" +msgstr "Автозавершение" #: searx/templates/courgette/preferences.html:45 #: searx/templates/legacy/preferences.html:46 @@ -622,7 +622,7 @@ msgstr "Ошибка!" #: searx/templates/oscar/base.html:90 searx/templates/simple/base.html:55 msgid "Powered by" -msgstr "Используется" +msgstr "Основано на" #: searx/templates/oscar/base.html:90 searx/templates/simple/base.html:55 msgid "a privacy-respecting, hackable metasearch engine" @@ -631,7 +631,7 @@ msgstr "уважающая вашу приватность, открытая м #: searx/templates/oscar/macros.html:36 searx/templates/oscar/macros.html:50 #: searx/templates/simple/macros.html:43 msgid "proxied" -msgstr "proxy" +msgstr "proxied" #: searx/templates/oscar/macros.html:92 msgid "supported" @@ -671,7 +671,7 @@ msgstr "Cookie" #: searx/templates/oscar/preferences.html:42 #: searx/templates/simple/preferences.html:48 msgid "What language do you prefer for search?" -msgstr "На каком языке вы предпочитаете искать?" +msgstr "Какой язык предпочтителен для поиска?" #: searx/templates/oscar/preferences.html:48 #: searx/templates/simple/preferences.html:128 @@ -686,7 +686,7 @@ msgstr "Поисковые предложения по мере ввода" #: searx/templates/oscar/preferences.html:69 #: searx/templates/simple/preferences.html:173 msgid "Proxying image results through searx" -msgstr "Загружать найденные изображения через searx" +msgstr "Проксировать найденные изображения с помощью searx" #: searx/templates/oscar/preferences.html:78 msgid "" @@ -698,7 +698,7 @@ msgstr "Изменяет способ отправки запросов. <a href #: searx/templates/oscar/preferences.html:87 #: searx/templates/simple/preferences.html:71 msgid "Filter content" -msgstr "Фильтрация содержимого для взрослых в результатах поиска." +msgstr "Фильтрация контента" #: searx/templates/oscar/preferences.html:97 #: searx/templates/simple/preferences.html:139 @@ -800,7 +800,7 @@ msgstr "URL поиска для текущих сохраненных парам msgid "" "Note: specifying custom settings in the search URL can reduce privacy by " "leaking data to the clicked result sites." -msgstr "Обратите внимание, что задание пользовательских параметров в URL поиска может привести к их утечке к посещаемым сайтам из поисковой выдачи." +msgstr "Учтите, что укаание пользовательских настроек в URL поиска может привести к их утечке к посещаемым сайтам из поисковой выдачи." #: searx/templates/oscar/results.html:17 msgid "Search results" @@ -884,7 +884,7 @@ msgstr "Движки не могут получить результаты." #: searx/templates/oscar/messages/no_results.html:10 #: searx/templates/simple/messages/no_results.html:10 msgid "Please, try again later or find another searx instance." -msgstr "Пожалуйста, попробуйте позже или воспользуйтесь другим searx инстансом." +msgstr "Пожалуйста, попробуйте позже или воспользуйтесь другим сервером searx." #: searx/templates/oscar/messages/no_results.html:14 #: searx/templates/simple/messages/no_results.html:14 diff --git a/searx/translations/sk/LC_MESSAGES/messages.mo b/searx/translations/sk/LC_MESSAGES/messages.mo index af7ac9dbba..0d8f6fa707 100644 Binary files a/searx/translations/sk/LC_MESSAGES/messages.mo and b/searx/translations/sk/LC_MESSAGES/messages.mo differ diff --git a/searx/translations/sl/LC_MESSAGES/messages.mo b/searx/translations/sl/LC_MESSAGES/messages.mo index f20b5275b3..b2cf9e1b13 100644 Binary files a/searx/translations/sl/LC_MESSAGES/messages.mo and b/searx/translations/sl/LC_MESSAGES/messages.mo differ diff --git a/searx/translations/sl/LC_MESSAGES/messages.po b/searx/translations/sl/LC_MESSAGES/messages.po index f3e6fef070..3ce7f97d63 100644 --- a/searx/translations/sl/LC_MESSAGES/messages.po +++ b/searx/translations/sl/LC_MESSAGES/messages.po @@ -3,14 +3,14 @@ # This file is distributed under the same license as the PROJECT project. # # Translators: -# asladic <ales.sladic@gmail.com>, 2017 +# asladic <ales.sladic@gmail.com>, 2017-2018 msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" "POT-Creation-Date: 2017-11-01 21:31+0100\n" -"PO-Revision-Date: 2017-11-01 20:31+0000\n" -"Last-Translator: Adam Tauber <asciimoo@gmail.com>\n" +"PO-Revision-Date: 2018-05-01 08:59+0000\n" +"Last-Translator: asladic <ales.sladic@gmail.com>\n" "Language-Team: Slovenian (http://www.transifex.com/asciimoo/searx/language/sl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,15 +21,15 @@ msgstr "" #: searx/search.py:137 searx/search.py:182 msgid "timeout" -msgstr "" +msgstr "presežena časovna omejitev" #: searx/search.py:144 msgid "request exception" -msgstr "" +msgstr "napaka poizvedbe" #: searx/search.py:151 msgid "unexpected crash" -msgstr "" +msgstr "nepričakovana napaka" #: searx/webapp.py:136 msgid "files" @@ -77,7 +77,7 @@ msgstr "Neveljavne nastavitve. Prosimo, preverite vašo konfiguracijo" #: searx/webapp.py:415 msgid "Invalid settings" -msgstr "" +msgstr "Neveljavne nastavitve" #: searx/webapp.py:449 searx/webapp.py:493 msgid "search error" @@ -630,11 +630,11 @@ msgstr "preko posredniškega strežnika" #: searx/templates/oscar/macros.html:92 msgid "supported" -msgstr "" +msgstr "podprto" #: searx/templates/oscar/macros.html:96 msgid "not supported" -msgstr "" +msgstr "ni podprto" #: searx/templates/oscar/preferences.html:13 #: searx/templates/oscar/preferences.html:22 @@ -718,7 +718,7 @@ msgstr "" msgid "" "Redirect to open-access versions of publications when available (plugin " "required)" -msgstr "" +msgstr "Preusmeri na prosto dostopne različice publikacij, ko so na voljo (zahtevan vtičnik)" #: searx/templates/oscar/preferences.html:163 #: searx/templates/oscar/preferences.html:175 @@ -729,7 +729,7 @@ msgstr "Bližnjica" #: searx/templates/oscar/preferences.html:164 #: searx/templates/oscar/preferences.html:174 msgid "Selected language" -msgstr "" +msgstr "Izbrani jezik" #: searx/templates/oscar/preferences.html:166 #: searx/templates/oscar/preferences.html:172 @@ -789,13 +789,13 @@ msgstr "Vrednost" #: searx/templates/oscar/preferences.html:301 msgid "Search URL of the currently saved preferences" -msgstr "" +msgstr "Iskalni URL trenutno shranjenih nastavitev" #: searx/templates/oscar/preferences.html:301 msgid "" "Note: specifying custom settings in the search URL can reduce privacy by " "leaking data to the clicked result sites." -msgstr "" +msgstr "Opomba: navajanje lastnih nastavitev v iskalnem URL lahko vodi do zmanjšane zasebnosti preko podajanja podatkov izbranim rezultatom." #: searx/templates/oscar/results.html:17 msgid "Search results" @@ -804,12 +804,12 @@ msgstr "Zadetki iskanja" #: searx/templates/oscar/results.html:21 #: searx/templates/simple/results.html:84 msgid "Try searching for:" -msgstr "" +msgstr "Poskusite iskati:" #: searx/templates/oscar/results.html:100 #: searx/templates/simple/results.html:25 msgid "Engines cannot retrieve results" -msgstr "" +msgstr "Iskalniki ne morejo pridobiti rezultatov" #: searx/templates/oscar/results.html:131 msgid "Links" @@ -874,12 +874,12 @@ msgstr "Trenutno ni podatkov na voljo." #: searx/templates/oscar/messages/no_results.html:4 #: searx/templates/simple/messages/no_results.html:4 msgid "Engines cannot retrieve results." -msgstr "" +msgstr "Iskalniki ne morejo pridobiti rezultatov." #: searx/templates/oscar/messages/no_results.html:10 #: searx/templates/simple/messages/no_results.html:10 msgid "Please, try again later or find another searx instance." -msgstr "" +msgstr "Prosimo, poskusite kasneje tu ali na drugi instanci searx." #: searx/templates/oscar/messages/no_results.html:14 #: searx/templates/simple/messages/no_results.html:14 @@ -998,7 +998,7 @@ msgstr "Naloži več..." #: searx/templates/simple/base.html:31 msgid "No item found" -msgstr "" +msgstr "Ni zadetkov" #: searx/templates/simple/preferences.html:89 msgid "Supports selected language" @@ -1006,8 +1006,8 @@ msgstr "Podpira izbrani jezik" #: searx/templates/simple/preferences.html:118 msgid "User interface" -msgstr "" +msgstr "Uporabniški vmesnik" #: searx/templates/simple/preferences.html:154 msgid "Privacy" -msgstr "" +msgstr "Zasebnost" diff --git a/searx/translations/sr/LC_MESSAGES/messages.mo b/searx/translations/sr/LC_MESSAGES/messages.mo index b38a68d1d3..65efaaa1a9 100644 Binary files a/searx/translations/sr/LC_MESSAGES/messages.mo and b/searx/translations/sr/LC_MESSAGES/messages.mo differ diff --git a/searx/translations/sv/LC_MESSAGES/messages.mo b/searx/translations/sv/LC_MESSAGES/messages.mo index b3687f94a4..73d36de8cd 100644 Binary files a/searx/translations/sv/LC_MESSAGES/messages.mo and b/searx/translations/sv/LC_MESSAGES/messages.mo differ diff --git a/searx/translations/sv/LC_MESSAGES/messages.po b/searx/translations/sv/LC_MESSAGES/messages.po index 3c98e06fc6..e8b01c8324 100644 --- a/searx/translations/sv/LC_MESSAGES/messages.po +++ b/searx/translations/sv/LC_MESSAGES/messages.po @@ -4,13 +4,14 @@ # # Translators: # Jonatan Nyberg, 2016-2017 +# Jonatan Nyberg, 2018 # Jonatan Nyberg, 2017-2018 msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" "POT-Creation-Date: 2017-11-01 21:31+0100\n" -"PO-Revision-Date: 2018-01-13 11:39+0000\n" +"PO-Revision-Date: 2018-07-24 18:39+0000\n" "Last-Translator: Jonatan Nyberg\n" "Language-Team: Swedish (http://www.transifex.com/asciimoo/searx/language/sv/)\n" "MIME-Version: 1.0\n" @@ -160,7 +161,7 @@ msgstr "Automatiskt ladda nästa sida när du bläddrar till botten av aktuell s #: searx/plugins/oa_doi_rewrite.py:9 msgid "Open Access DOI rewrite" -msgstr "" +msgstr "Open Access DOI-omskrivning" #: searx/plugins/oa_doi_rewrite.py:10 msgid "" @@ -182,7 +183,7 @@ msgstr "Resultat öppnas i samma fönster som standard. Denna insticksmodul skri #: searx/plugins/search_on_category_select.py:18 msgid "Search on category select" -msgstr "Sök på kategori välj" +msgstr "Sök vid val av kategori" #: searx/plugins/search_on_category_select.py:19 msgid "" @@ -198,7 +199,7 @@ msgstr "Visar din IP om förfrågan är \"ip\" och din användaragent om förfr #: searx/plugins/tracker_url_remover.py:26 msgid "Tracker URL remover" -msgstr "Trackerwebbadress borttagare" +msgstr "Bevakningswebbadress borttagare" #: searx/plugins/tracker_url_remover.py:27 msgid "Remove trackers arguments from the returned URL" @@ -263,7 +264,7 @@ msgstr "Inställningar" #: searx/templates/oscar/preferences.html:35 #: searx/templates/simple/preferences.html:34 msgid "Default categories" -msgstr "Standard kategorier" +msgstr "Standardkategorier" #: searx/templates/courgette/preferences.html:13 #: searx/templates/legacy/preferences.html:14 @@ -713,7 +714,7 @@ msgstr "Stil" #: searx/templates/oscar/preferences.html:122 msgid "Open Access DOI resolver" -msgstr "" +msgstr "Open Access DOI-lösare" #: searx/templates/oscar/preferences.html:123 msgid "" diff --git a/searx/translations/te/LC_MESSAGES/messages.mo b/searx/translations/te/LC_MESSAGES/messages.mo new file mode 100644 index 0000000000..57488bf0bd Binary files /dev/null and b/searx/translations/te/LC_MESSAGES/messages.mo differ diff --git a/searx/translations/te/LC_MESSAGES/messages.po b/searx/translations/te/LC_MESSAGES/messages.po new file mode 100644 index 0000000000..8da1506ccf --- /dev/null +++ b/searx/translations/te/LC_MESSAGES/messages.po @@ -0,0 +1,1013 @@ +# Translations template for PROJECT. +# Copyright (C) 2017 ORGANIZATION +# This file is distributed under the same license as the PROJECT project. +# +# Translators: +# Joseph Nuthalapati <njoseph@thoughtworks.com>, 2018 +msgid "" +msgstr "" +"Project-Id-Version: searx\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2017-11-01 21:31+0100\n" +"PO-Revision-Date: 2018-03-08 16:40+0000\n" +"Last-Translator: Joseph Nuthalapati <njoseph@thoughtworks.com>\n" +"Language-Team: Telugu (http://www.transifex.com/asciimoo/searx/language/te/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 2.3.4\n" +"Language: te\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: searx/search.py:137 searx/search.py:182 +msgid "timeout" +msgstr "కాలపరిమితి దాటిపోయింది" + +#: searx/search.py:144 +msgid "request exception" +msgstr "" + +#: searx/search.py:151 +msgid "unexpected crash" +msgstr "" + +#: searx/webapp.py:136 +msgid "files" +msgstr "ఫైళ్ళు" + +#: searx/webapp.py:137 +msgid "general" +msgstr "సాధారణ" + +#: searx/webapp.py:138 +msgid "music" +msgstr "సంగీతం" + +#: searx/webapp.py:139 +msgid "social media" +msgstr "సోషల్ మీడియా" + +#: searx/webapp.py:140 +msgid "images" +msgstr "చిత్రాలు" + +#: searx/webapp.py:141 +msgid "videos" +msgstr "వీడియోలు" + +#: searx/webapp.py:142 +msgid "it" +msgstr "ఐటి" + +#: searx/webapp.py:143 +msgid "news" +msgstr "వార్తలు" + +#: searx/webapp.py:144 +msgid "map" +msgstr "పటము" + +#: searx/webapp.py:145 +msgid "science" +msgstr "విజ్ఞానశాస్త్రం" + +#: searx/webapp.py:399 searx/webapp.py:658 +msgid "Invalid settings, please edit your preferences" +msgstr "" + +#: searx/webapp.py:415 +msgid "Invalid settings" +msgstr "చెల్లని అమరికలు" + +#: searx/webapp.py:449 searx/webapp.py:493 +msgid "search error" +msgstr "శోధనలో దోషము" + +#: searx/webapp.py:530 +msgid "{minutes} minute(s) ago" +msgstr "{minutes} నిమిషము(ల) క్రిందట" + +#: searx/webapp.py:532 +msgid "{hours} hour(s), {minutes} minute(s) ago" +msgstr "" + +#: searx/answerers/random/answerer.py:53 +msgid "Random value generator" +msgstr "" + +#: searx/answerers/random/answerer.py:54 +msgid "Generate different random values" +msgstr "" + +#: searx/answerers/statistics/answerer.py:53 +msgid "Statistics functions" +msgstr "సాంఖ్యకశాస్త్ర ప్రమేయాలు" + +#: searx/answerers/statistics/answerer.py:54 +msgid "Compute {functions} of the arguments" +msgstr "" + +#: searx/engines/__init__.py:194 searx/engines/flycheck___init__.py:201 +msgid "Engine time (sec)" +msgstr "" + +#: searx/engines/__init__.py:198 searx/engines/flycheck___init__.py:205 +msgid "Page loads (sec)" +msgstr "" + +#: searx/engines/__init__.py:202 searx/engines/flycheck___init__.py:209 +#: searx/templates/oscar/results.html:95 +#: searx/templates/simple/results.html:20 +msgid "Number of results" +msgstr "ఫలితముల సంఖ్య" + +#: searx/engines/__init__.py:206 searx/engines/flycheck___init__.py:213 +msgid "Scores" +msgstr "" + +#: searx/engines/__init__.py:210 searx/engines/flycheck___init__.py:217 +msgid "Scores per result" +msgstr "" + +#: searx/engines/__init__.py:214 searx/engines/flycheck___init__.py:221 +msgid "Errors" +msgstr "దోషములు" + +#: searx/engines/pdbe.py:87 +msgid "{title} (OBSOLETE)" +msgstr "" + +#: searx/engines/pdbe.py:91 +msgid "This entry has been superseded by" +msgstr "" + +#: searx/engines/pubmed.py:74 +msgid "No abstract is available for this publication." +msgstr "" + +#: searx/plugins/https_rewrite.py:32 +msgid "Rewrite HTTP links to HTTPS if possible" +msgstr "" + +#: searx/plugins/infinite_scroll.py:3 +msgid "Infinite scroll" +msgstr "" + +#: searx/plugins/infinite_scroll.py:4 +msgid "Automatically load next page when scrolling to bottom of current page" +msgstr "" + +#: searx/plugins/oa_doi_rewrite.py:9 +msgid "Open Access DOI rewrite" +msgstr "" + +#: searx/plugins/oa_doi_rewrite.py:10 +msgid "" +"Avoid paywalls by redirecting to open-access versions of publications when " +"available" +msgstr "" + +#: searx/plugins/open_results_on_new_tab.py:18 +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/simple/preferences.html:149 +msgid "Open result links on new browser tabs" +msgstr "" + +#: searx/plugins/open_results_on_new_tab.py:19 +msgid "" +"Results are opened in the same window by default. This plugin overwrites the" +" default behaviour to open links on new tabs/windows. (JavaScript required)" +msgstr "" + +#: searx/plugins/search_on_category_select.py:18 +msgid "Search on category select" +msgstr "" + +#: searx/plugins/search_on_category_select.py:19 +msgid "" +"Perform search immediately if a category selected. Disable to select " +"multiple categories. (JavaScript required)" +msgstr "" + +#: searx/plugins/self_info.py:20 +msgid "" +"Displays your IP if the query is \"ip\" and your user agent if the query " +"contains \"user agent\"." +msgstr "" + +#: searx/plugins/tracker_url_remover.py:26 +msgid "Tracker URL remover" +msgstr "" + +#: searx/plugins/tracker_url_remover.py:27 +msgid "Remove trackers arguments from the returned URL" +msgstr "" + +#: searx/plugins/vim_hotkeys.py:3 +msgid "Vim-like hotkeys" +msgstr "" + +#: searx/plugins/vim_hotkeys.py:4 +msgid "" +"Navigate search results with Vim-like hotkeys (JavaScript required). Press " +"\"h\" key on main or result page to get help." +msgstr "" + +#: searx/templates/courgette/404.html:4 searx/templates/legacy/404.html:4 +#: searx/templates/oscar/404.html:4 searx/templates/pix-art/404.html:4 +#: searx/templates/simple/404.html:4 +msgid "Page not found" +msgstr "పుట దొరకలేదు" + +#: searx/templates/courgette/404.html:6 searx/templates/legacy/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +#: searx/templates/simple/404.html:6 +#, python-format +msgid "Go to %(search_page)s." +msgstr "%(search_page)sకు వెళ్ళు" + +#: searx/templates/courgette/404.html:6 searx/templates/legacy/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +#: searx/templates/simple/404.html:6 +msgid "search page" +msgstr "శోధన పుట" + +#: searx/templates/courgette/index.html:9 +#: searx/templates/courgette/index.html:13 +#: searx/templates/courgette/results.html:5 +#: searx/templates/legacy/index.html:8 searx/templates/legacy/index.html:12 +#: searx/templates/oscar/navbar.html:7 +#: searx/templates/oscar/preferences.html:3 +#: searx/templates/pix-art/index.html:8 +msgid "preferences" +msgstr "అభిరుచులు" + +#: searx/templates/courgette/index.html:11 +#: searx/templates/legacy/index.html:10 searx/templates/oscar/about.html:2 +#: searx/templates/oscar/navbar.html:6 searx/templates/pix-art/index.html:7 +msgid "about" +msgstr "గురించి" + +#: searx/templates/courgette/preferences.html:5 +#: searx/templates/legacy/preferences.html:5 +#: searx/templates/oscar/preferences.html:8 +#: searx/templates/pix-art/preferences.html:5 +#: searx/templates/simple/preferences.html:26 +msgid "Preferences" +msgstr "అభిరుచులు" + +#: searx/templates/courgette/preferences.html:9 +#: searx/templates/legacy/preferences.html:9 +#: searx/templates/oscar/preferences.html:33 +#: searx/templates/oscar/preferences.html:35 +#: searx/templates/simple/preferences.html:34 +msgid "Default categories" +msgstr "నిష్క్రియ వర్గాలు" + +#: searx/templates/courgette/preferences.html:13 +#: searx/templates/legacy/preferences.html:14 +#: searx/templates/oscar/preferences.html:41 +#: searx/templates/pix-art/preferences.html:9 +#: searx/templates/simple/preferences.html:39 +#: searx/templates/simple/preferences.html:163 +msgid "Search language" +msgstr "శోధన భాష" + +#: searx/templates/courgette/preferences.html:16 +#: searx/templates/legacy/preferences.html:17 +#: searx/templates/oscar/languages.html:6 +#: searx/templates/pix-art/preferences.html:12 +#: searx/templates/simple/languages.html:2 +#: searx/templates/simple/preferences.html:42 +msgid "Default language" +msgstr "నిష్క్రియ భాష" + +#: searx/templates/courgette/preferences.html:24 +#: searx/templates/legacy/preferences.html:25 +#: searx/templates/oscar/preferences.html:47 +#: searx/templates/pix-art/preferences.html:20 +#: searx/templates/simple/preferences.html:120 +msgid "Interface language" +msgstr "వినిమయసీమ భాష" + +#: searx/templates/courgette/preferences.html:34 +#: searx/templates/legacy/preferences.html:35 +#: searx/templates/oscar/preferences.html:57 +#: searx/templates/simple/preferences.html:51 +msgid "Autocomplete" +msgstr "" + +#: searx/templates/courgette/preferences.html:45 +#: searx/templates/legacy/preferences.html:46 +#: searx/templates/oscar/preferences.html:68 +#: searx/templates/simple/preferences.html:166 +msgid "Image proxy" +msgstr "" + +#: searx/templates/courgette/preferences.html:48 +#: searx/templates/legacy/preferences.html:49 +#: searx/templates/oscar/preferences.html:72 +#: searx/templates/simple/preferences.html:169 +msgid "Enabled" +msgstr "" + +#: searx/templates/courgette/preferences.html:49 +#: searx/templates/legacy/preferences.html:50 +#: searx/templates/oscar/preferences.html:73 +#: searx/templates/simple/preferences.html:170 +msgid "Disabled" +msgstr "" + +#: searx/templates/courgette/preferences.html:54 +#: searx/templates/legacy/preferences.html:55 +#: searx/templates/oscar/preferences.html:77 +#: searx/templates/pix-art/preferences.html:30 +#: searx/templates/simple/preferences.html:156 +msgid "Method" +msgstr "విధానం" + +#: searx/templates/courgette/preferences.html:63 +#: searx/templates/legacy/preferences.html:64 +#: searx/templates/oscar/preferences.html:86 +#: searx/templates/oscar/preferences.html:165 +#: searx/templates/oscar/preferences.html:173 +#: searx/templates/simple/preferences.html:63 +#: searx/templates/simple/preferences.html:90 +msgid "SafeSearch" +msgstr "సురక్షితశోధన" + +#: searx/templates/courgette/preferences.html:66 +#: searx/templates/legacy/preferences.html:67 +#: searx/templates/oscar/preferences.html:90 +#: searx/templates/simple/preferences.html:66 +msgid "Strict" +msgstr "కఠినమైన" + +#: searx/templates/courgette/preferences.html:67 +#: searx/templates/legacy/preferences.html:68 +#: searx/templates/oscar/preferences.html:91 +#: searx/templates/simple/preferences.html:67 +msgid "Moderate" +msgstr "మితమైన" + +#: searx/templates/courgette/preferences.html:68 +#: searx/templates/legacy/preferences.html:69 +#: searx/templates/oscar/preferences.html:92 +#: searx/templates/simple/preferences.html:68 +msgid "None" +msgstr "ఏమీ లేదు" + +#: searx/templates/courgette/preferences.html:73 +#: searx/templates/legacy/preferences.html:74 +#: searx/templates/oscar/preferences.html:96 +#: searx/templates/pix-art/preferences.html:39 +#: searx/templates/simple/preferences.html:131 +msgid "Themes" +msgstr "" + +#: searx/templates/courgette/preferences.html:83 +msgid "Color" +msgstr "రంగు" + +#: searx/templates/courgette/preferences.html:86 +msgid "Blue (default)" +msgstr "నీలం (నిష్క్రియం)" + +#: searx/templates/courgette/preferences.html:87 +msgid "Violet" +msgstr "ఊదారంగు" + +#: searx/templates/courgette/preferences.html:88 +msgid "Green" +msgstr "ఆకుపచ్చ" + +#: searx/templates/courgette/preferences.html:89 +msgid "Cyan" +msgstr " ముదురు నీలం" + +#: searx/templates/courgette/preferences.html:90 +msgid "Orange" +msgstr "నారింజ" + +#: searx/templates/courgette/preferences.html:91 +msgid "Red" +msgstr "ఎరుపు" + +#: searx/templates/courgette/preferences.html:96 +#: searx/templates/legacy/preferences.html:93 +#: searx/templates/pix-art/preferences.html:49 +#: searx/templates/simple/preferences.html:77 +msgid "Currently used search engines" +msgstr "ప్రస్తుతం ఉపయోగించబడుతున్న శోధన యంత్రాలు" + +#: searx/templates/courgette/preferences.html:100 +#: searx/templates/legacy/preferences.html:97 +#: searx/templates/oscar/preferences.html:162 +#: searx/templates/oscar/preferences.html:176 +#: searx/templates/pix-art/preferences.html:53 +#: searx/templates/simple/preferences.html:87 +msgid "Engine name" +msgstr "యంత్రం పేరు" + +#: searx/templates/courgette/preferences.html:101 +#: searx/templates/legacy/preferences.html:98 +msgid "Category" +msgstr "వర్గము" + +#: searx/templates/courgette/preferences.html:102 +#: searx/templates/courgette/preferences.html:113 +#: searx/templates/legacy/preferences.html:99 +#: searx/templates/legacy/preferences.html:110 +#: searx/templates/oscar/preferences.html:161 +#: searx/templates/oscar/preferences.html:177 +#: searx/templates/pix-art/preferences.html:54 +#: searx/templates/pix-art/preferences.html:64 +#: searx/templates/simple/preferences.html:86 +msgid "Allow" +msgstr "అనుమతించు" + +#: searx/templates/courgette/preferences.html:102 +#: searx/templates/courgette/preferences.html:114 +#: searx/templates/legacy/preferences.html:99 +#: searx/templates/legacy/preferences.html:111 +#: searx/templates/pix-art/preferences.html:54 +#: searx/templates/pix-art/preferences.html:65 +msgid "Block" +msgstr "అడ్డగించు" + +#: searx/templates/courgette/preferences.html:122 +#: searx/templates/legacy/preferences.html:119 +#: searx/templates/oscar/preferences.html:297 +#: searx/templates/pix-art/preferences.html:73 +#: searx/templates/simple/preferences.html:180 +msgid "" +"These settings are stored in your cookies, this allows us not to store this " +"data about you." +msgstr "" + +#: searx/templates/courgette/preferences.html:124 +#: searx/templates/legacy/preferences.html:121 +#: searx/templates/oscar/preferences.html:299 +#: searx/templates/pix-art/preferences.html:75 +#: searx/templates/simple/preferences.html:182 +msgid "" +"These cookies serve your sole convenience, we don't use these cookies to " +"track you." +msgstr "" + +#: searx/templates/courgette/preferences.html:127 +#: searx/templates/legacy/preferences.html:124 +#: searx/templates/oscar/preferences.html:305 +#: searx/templates/pix-art/preferences.html:78 +#: searx/templates/simple/preferences.html:185 +msgid "save" +msgstr "దాచు" + +#: searx/templates/courgette/preferences.html:128 +#: searx/templates/legacy/preferences.html:125 +#: searx/templates/oscar/preferences.html:307 +#: searx/templates/simple/preferences.html:186 +msgid "Reset defaults" +msgstr "నిష్క్రియాలకు అమర్చు" + +#: searx/templates/courgette/preferences.html:129 +#: searx/templates/legacy/preferences.html:126 +#: searx/templates/oscar/preferences.html:306 +#: searx/templates/pix-art/preferences.html:79 +#: searx/templates/simple/preferences.html:187 +msgid "back" +msgstr "వెనక్కి" + +#: searx/templates/courgette/results.html:12 +#: searx/templates/legacy/results.html:13 +#: searx/templates/oscar/results.html:136 +#: searx/templates/simple/results.html:58 +msgid "Search URL" +msgstr "శోధన URL" + +#: searx/templates/courgette/results.html:16 +#: searx/templates/legacy/results.html:17 +#: searx/templates/oscar/results.html:141 +#: searx/templates/simple/results.html:62 +msgid "Download results" +msgstr "ఫలితాలను దింపుకోండి" + +#: searx/templates/courgette/results.html:34 +#: searx/templates/legacy/results.html:35 +#: searx/templates/simple/results.html:10 +msgid "Answers" +msgstr "జవాబులు" + +#: searx/templates/courgette/results.html:42 +#: searx/templates/legacy/results.html:43 +#: searx/templates/oscar/results.html:116 +#: searx/templates/simple/results.html:42 +msgid "Suggestions" +msgstr "సూచనలు" + +#: searx/templates/courgette/results.html:70 +#: searx/templates/legacy/results.html:81 +#: searx/templates/oscar/results.html:68 searx/templates/oscar/results.html:78 +#: searx/templates/simple/results.html:130 +msgid "previous page" +msgstr "పూర్వపు పుట" + +#: searx/templates/courgette/results.html:81 +#: searx/templates/legacy/results.html:92 +#: searx/templates/oscar/results.html:62 searx/templates/oscar/results.html:84 +#: searx/templates/simple/results.html:145 +msgid "next page" +msgstr "తర్వాతి పుట" + +#: searx/templates/courgette/search.html:3 +#: searx/templates/legacy/search.html:3 searx/templates/oscar/search.html:6 +#: searx/templates/oscar/search_full.html:9 +#: searx/templates/pix-art/search.html:3 searx/templates/simple/search.html:4 +msgid "Search for..." +msgstr "శోధించు..." + +#: searx/templates/courgette/stats.html:4 searx/templates/legacy/stats.html:4 +#: searx/templates/oscar/stats.html:5 searx/templates/pix-art/stats.html:4 +#: searx/templates/simple/stats.html:7 +msgid "Engine stats" +msgstr "" + +#: searx/templates/courgette/result_templates/images.html:4 +#: searx/templates/legacy/result_templates/images.html:4 +#: searx/templates/pix-art/result_templates/images.html:4 +msgid "original context" +msgstr "" + +#: searx/templates/courgette/result_templates/torrent.html:7 +#: searx/templates/legacy/result_templates/torrent.html:11 +#: searx/templates/oscar/result_templates/torrent.html:6 +#: searx/templates/simple/result_templates/torrent.html:9 +msgid "Seeder" +msgstr "" + +#: searx/templates/courgette/result_templates/torrent.html:7 +#: searx/templates/legacy/result_templates/torrent.html:11 +#: searx/templates/oscar/result_templates/torrent.html:6 +#: searx/templates/simple/result_templates/torrent.html:9 +msgid "Leecher" +msgstr "" + +#: searx/templates/courgette/result_templates/torrent.html:9 +#: searx/templates/legacy/result_templates/torrent.html:9 +#: searx/templates/oscar/macros.html:23 +#: searx/templates/simple/result_templates/torrent.html:6 +msgid "magnet link" +msgstr "" + +#: searx/templates/courgette/result_templates/torrent.html:10 +#: searx/templates/legacy/result_templates/torrent.html:10 +#: searx/templates/oscar/macros.html:24 +#: searx/templates/simple/result_templates/torrent.html:7 +msgid "torrent file" +msgstr "" + +#: searx/templates/legacy/categories.html:8 +#: searx/templates/simple/categories.html:6 +msgid "Click on the magnifier to perform search" +msgstr "" + +#: searx/templates/legacy/preferences.html:84 +#: searx/templates/oscar/preferences.html:113 +#: searx/templates/simple/preferences.html:142 +msgid "Results on new tabs" +msgstr "" + +#: searx/templates/legacy/preferences.html:87 +#: searx/templates/oscar/preferences.html:117 +#: searx/templates/simple/preferences.html:145 +msgid "On" +msgstr "" + +#: searx/templates/legacy/preferences.html:88 +#: searx/templates/oscar/preferences.html:118 +#: searx/templates/simple/preferences.html:146 +msgid "Off" +msgstr "" + +#: searx/templates/legacy/result_templates/code.html:3 +#: searx/templates/legacy/result_templates/default.html:3 +#: searx/templates/legacy/result_templates/map.html:9 +#: searx/templates/oscar/macros.html:34 searx/templates/oscar/macros.html:48 +#: searx/templates/simple/macros.html:43 +msgid "cached" +msgstr "" + +#: searx/templates/oscar/advanced.html:4 +msgid "Advanced settings" +msgstr "" + +#: searx/templates/oscar/base.html:62 +#: searx/templates/oscar/messages/first_time.html:4 +#: searx/templates/oscar/messages/save_settings_successfull.html:5 +#: searx/templates/oscar/messages/unknow_error.html:5 +msgid "Close" +msgstr "మూసివేయు" + +#: searx/templates/oscar/base.html:64 +#: searx/templates/oscar/messages/no_results.html:4 +#: searx/templates/simple/messages/no_results.html:4 +#: searx/templates/simple/results.html:25 +msgid "Error!" +msgstr "దోషం!" + +#: searx/templates/oscar/base.html:90 searx/templates/simple/base.html:55 +msgid "Powered by" +msgstr "" + +#: searx/templates/oscar/base.html:90 searx/templates/simple/base.html:55 +msgid "a privacy-respecting, hackable metasearch engine" +msgstr "" + +#: searx/templates/oscar/macros.html:36 searx/templates/oscar/macros.html:50 +#: searx/templates/simple/macros.html:43 +msgid "proxied" +msgstr "" + +#: searx/templates/oscar/macros.html:92 +msgid "supported" +msgstr "ఆదరించబడిన" + +#: searx/templates/oscar/macros.html:96 +msgid "not supported" +msgstr "ఆదరణ లేని" + +#: searx/templates/oscar/preferences.html:13 +#: searx/templates/oscar/preferences.html:22 +#: searx/templates/simple/preferences.html:32 +msgid "General" +msgstr "సాధారణ" + +#: searx/templates/oscar/preferences.html:14 +#: searx/templates/oscar/preferences.html:146 +#: searx/templates/simple/preferences.html:76 +msgid "Engines" +msgstr "యంత్రాలు" + +#: searx/templates/oscar/preferences.html:15 +#: searx/templates/oscar/preferences.html:219 +msgid "Plugins" +msgstr "ప్లగిన్లు" + +#: searx/templates/oscar/preferences.html:16 +#: searx/templates/oscar/preferences.html:245 +msgid "Answerers" +msgstr "జవాబులు" + +#: searx/templates/oscar/preferences.html:17 +#: searx/templates/oscar/preferences.html:272 +msgid "Cookies" +msgstr "కుకీలు" + +#: searx/templates/oscar/preferences.html:42 +#: searx/templates/simple/preferences.html:48 +msgid "What language do you prefer for search?" +msgstr "" + +#: searx/templates/oscar/preferences.html:48 +#: searx/templates/simple/preferences.html:128 +msgid "Change the language of the layout" +msgstr "వినిమయసీమ యొక్క భాషను మార్చు" + +#: searx/templates/oscar/preferences.html:58 +#: searx/templates/simple/preferences.html:60 +msgid "Find stuff as you type" +msgstr "టైపు చేస్తూ శోధించు" + +#: searx/templates/oscar/preferences.html:69 +#: searx/templates/simple/preferences.html:173 +msgid "Proxying image results through searx" +msgstr "" + +#: searx/templates/oscar/preferences.html:78 +msgid "" +"Change how forms are submited, <a " +"href=\"http://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods\"" +" rel=\"external\">learn more about request methods</a>" +msgstr "" + +#: searx/templates/oscar/preferences.html:87 +#: searx/templates/simple/preferences.html:71 +msgid "Filter content" +msgstr "విషయాలను వడకట్టు" + +#: searx/templates/oscar/preferences.html:97 +#: searx/templates/simple/preferences.html:139 +msgid "Change searx layout" +msgstr "" + +#: searx/templates/oscar/preferences.html:106 +#: searx/templates/oscar/preferences.html:111 +msgid "Choose style for this theme" +msgstr "" + +#: searx/templates/oscar/preferences.html:106 +#: searx/templates/oscar/preferences.html:111 +msgid "Style" +msgstr "శైలి" + +#: searx/templates/oscar/preferences.html:122 +msgid "Open Access DOI resolver" +msgstr "" + +#: searx/templates/oscar/preferences.html:123 +msgid "" +"Redirect to open-access versions of publications when available (plugin " +"required)" +msgstr "" + +#: searx/templates/oscar/preferences.html:163 +#: searx/templates/oscar/preferences.html:175 +#: searx/templates/simple/preferences.html:88 +msgid "Shortcut" +msgstr "సత్వరమార్గం" + +#: searx/templates/oscar/preferences.html:164 +#: searx/templates/oscar/preferences.html:174 +msgid "Selected language" +msgstr "ఎంచుకున్న భాష" + +#: searx/templates/oscar/preferences.html:166 +#: searx/templates/oscar/preferences.html:172 +#: searx/templates/simple/preferences.html:91 +msgid "Time range" +msgstr "కాల శ్రేణి" + +#: searx/templates/oscar/preferences.html:167 +#: searx/templates/oscar/preferences.html:171 +#: searx/templates/simple/preferences.html:92 +msgid "Avg. time" +msgstr "సగటు సమయం" + +#: searx/templates/oscar/preferences.html:168 +#: searx/templates/oscar/preferences.html:170 +#: searx/templates/simple/preferences.html:93 +msgid "Max time" +msgstr "గరిష్ఠ సమయం" + +#: searx/templates/oscar/preferences.html:248 +msgid "This is the list of searx's instant answering modules." +msgstr "" + +#: searx/templates/oscar/preferences.html:252 +msgid "Name" +msgstr "పేరు" + +#: searx/templates/oscar/preferences.html:253 +msgid "Keywords" +msgstr "" + +#: searx/templates/oscar/preferences.html:254 +msgid "Description" +msgstr "వర్ణన" + +#: searx/templates/oscar/preferences.html:255 +msgid "Examples" +msgstr "ఉదాహరణలు" + +#: searx/templates/oscar/preferences.html:275 +msgid "" +"This is the list of cookies and their values searx is storing on your " +"computer." +msgstr "" + +#: searx/templates/oscar/preferences.html:276 +msgid "With that list, you can assess searx transparency." +msgstr "" + +#: searx/templates/oscar/preferences.html:281 +msgid "Cookie name" +msgstr "కుకీ పేరు" + +#: searx/templates/oscar/preferences.html:282 +msgid "Value" +msgstr "విలువ" + +#: searx/templates/oscar/preferences.html:301 +msgid "Search URL of the currently saved preferences" +msgstr "" + +#: searx/templates/oscar/preferences.html:301 +msgid "" +"Note: specifying custom settings in the search URL can reduce privacy by " +"leaking data to the clicked result sites." +msgstr "" + +#: searx/templates/oscar/results.html:17 +msgid "Search results" +msgstr "" + +#: searx/templates/oscar/results.html:21 +#: searx/templates/simple/results.html:84 +msgid "Try searching for:" +msgstr "దీనికొరకు శోధించండి:" + +#: searx/templates/oscar/results.html:100 +#: searx/templates/simple/results.html:25 +msgid "Engines cannot retrieve results" +msgstr "యంత్రాలు ఫలితాలను రాబట్టలేకపోతున్నాయి" + +#: searx/templates/oscar/results.html:131 +msgid "Links" +msgstr "లంకెలు" + +#: searx/templates/oscar/search.html:8 +#: searx/templates/oscar/search_full.html:11 +#: searx/templates/simple/search.html:5 +msgid "Start search" +msgstr "శోధన ప్రారంభించు" + +#: searx/templates/oscar/stats.html:2 +msgid "stats" +msgstr "స్థితి వివరణ లెక్కలు" + +#: searx/templates/oscar/time-range.html:3 +#: searx/templates/simple/time-range.html:3 +msgid "Anytime" +msgstr "ఎప్పుడైనా" + +#: searx/templates/oscar/time-range.html:6 +#: searx/templates/simple/time-range.html:6 +msgid "Last day" +msgstr "క్రిందటి రోజు" + +#: searx/templates/oscar/time-range.html:9 +#: searx/templates/simple/time-range.html:9 +msgid "Last week" +msgstr "క్రిందటి వారం" + +#: searx/templates/oscar/time-range.html:12 +#: searx/templates/simple/time-range.html:12 +msgid "Last month" +msgstr "క్రిందటి నెల" + +#: searx/templates/oscar/time-range.html:15 +#: searx/templates/simple/time-range.html:15 +msgid "Last year" +msgstr "క్రిందటి సంవత్సరం" + +#: searx/templates/oscar/messages/first_time.html:6 +#: searx/templates/oscar/messages/no_data_available.html:3 +msgid "Heads up!" +msgstr "జాగ్రత్త!" + +#: searx/templates/oscar/messages/first_time.html:7 +msgid "It look like you are using searx first time." +msgstr "" + +#: searx/templates/oscar/messages/no_cookies.html:3 +msgid "Information!" +msgstr "సమాచారం!" + +#: searx/templates/oscar/messages/no_cookies.html:4 +msgid "currently, there are no cookies defined." +msgstr "" + +#: searx/templates/oscar/messages/no_data_available.html:4 +msgid "There is currently no data available. " +msgstr "" + +#: searx/templates/oscar/messages/no_results.html:4 +#: searx/templates/simple/messages/no_results.html:4 +msgid "Engines cannot retrieve results." +msgstr "యంత్రాలు ఫలితాలను రాబట్టలేకపోయాయి." + +#: searx/templates/oscar/messages/no_results.html:10 +#: searx/templates/simple/messages/no_results.html:10 +msgid "Please, try again later or find another searx instance." +msgstr "" + +#: searx/templates/oscar/messages/no_results.html:14 +#: searx/templates/simple/messages/no_results.html:14 +msgid "Sorry!" +msgstr "క్షమించండి!" + +#: searx/templates/oscar/messages/no_results.html:15 +#: searx/templates/simple/messages/no_results.html:15 +msgid "" +"we didn't find any results. Please use another query or search in more " +"categories." +msgstr "" + +#: searx/templates/oscar/messages/save_settings_successfull.html:7 +msgid "Well done!" +msgstr "భళా!" + +#: searx/templates/oscar/messages/save_settings_successfull.html:8 +msgid "Settings saved successfully." +msgstr "ఆమరికలు విజయవంతంగా పొందుపరచబడ్డాయి." + +#: searx/templates/oscar/messages/unknow_error.html:7 +msgid "Oh snap!" +msgstr "అయ్యో!" + +#: searx/templates/oscar/messages/unknow_error.html:8 +msgid "Something went wrong." +msgstr "ఏదో తప్పు జరిగింది." + +#: searx/templates/oscar/result_templates/default.html:7 +#: searx/templates/simple/result_templates/default.html:6 +msgid "show media" +msgstr "" + +#: searx/templates/oscar/result_templates/default.html:7 +#: searx/templates/simple/result_templates/default.html:6 +msgid "hide media" +msgstr "" + +#: searx/templates/oscar/result_templates/images.html:30 +msgid "Get image" +msgstr "" + +#: searx/templates/oscar/result_templates/images.html:33 +msgid "View source" +msgstr "" + +#: searx/templates/oscar/result_templates/map.html:7 +#: searx/templates/simple/result_templates/map.html:7 +msgid "show map" +msgstr "" + +#: searx/templates/oscar/result_templates/map.html:7 +#: searx/templates/simple/result_templates/map.html:7 +msgid "hide map" +msgstr "" + +#: searx/templates/oscar/result_templates/map.html:11 +#: searx/templates/simple/result_templates/map.html:11 +msgid "show details" +msgstr "" + +#: searx/templates/oscar/result_templates/map.html:11 +#: searx/templates/simple/result_templates/map.html:11 +msgid "hide details" +msgstr "" + +#: searx/templates/oscar/result_templates/torrent.html:7 +#: searx/templates/simple/result_templates/torrent.html:11 +msgid "Filesize" +msgstr "" + +#: searx/templates/oscar/result_templates/torrent.html:9 +#: searx/templates/simple/result_templates/torrent.html:12 +msgid "Bytes" +msgstr "" + +#: searx/templates/oscar/result_templates/torrent.html:10 +#: searx/templates/simple/result_templates/torrent.html:13 +msgid "kiB" +msgstr "" + +#: searx/templates/oscar/result_templates/torrent.html:11 +#: searx/templates/simple/result_templates/torrent.html:14 +msgid "MiB" +msgstr "" + +#: searx/templates/oscar/result_templates/torrent.html:12 +#: searx/templates/simple/result_templates/torrent.html:15 +msgid "GiB" +msgstr "" + +#: searx/templates/oscar/result_templates/torrent.html:13 +#: searx/templates/simple/result_templates/torrent.html:16 +msgid "TiB" +msgstr "" + +#: searx/templates/oscar/result_templates/torrent.html:15 +#: searx/templates/simple/result_templates/torrent.html:20 +msgid "Number of Files" +msgstr "ఫైళ్ళ సంఖ్య" + +#: searx/templates/oscar/result_templates/videos.html:7 +#: searx/templates/simple/result_templates/videos.html:6 +msgid "show video" +msgstr "వీడియో చూపించు" + +#: searx/templates/oscar/result_templates/videos.html:7 +#: searx/templates/simple/result_templates/videos.html:6 +msgid "hide video" +msgstr "వీడియోను దాచిపెట్టు" + +#: searx/templates/pix-art/results.html:28 +msgid "Load more..." +msgstr "" + +#: searx/templates/simple/base.html:31 +msgid "No item found" +msgstr "ఏమీ దొరకలేదు" + +#: searx/templates/simple/preferences.html:89 +msgid "Supports selected language" +msgstr "" + +#: searx/templates/simple/preferences.html:118 +msgid "User interface" +msgstr "" + +#: searx/templates/simple/preferences.html:154 +msgid "Privacy" +msgstr "ఆంతరంగికత" diff --git a/searx/translations/tr/LC_MESSAGES/messages.mo b/searx/translations/tr/LC_MESSAGES/messages.mo index 4125a24adb..ec47020aa0 100644 Binary files a/searx/translations/tr/LC_MESSAGES/messages.mo and b/searx/translations/tr/LC_MESSAGES/messages.mo differ diff --git a/searx/translations/tr/LC_MESSAGES/messages.po b/searx/translations/tr/LC_MESSAGES/messages.po index 65974de7a8..a15c85609f 100644 --- a/searx/translations/tr/LC_MESSAGES/messages.po +++ b/searx/translations/tr/LC_MESSAGES/messages.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PROJECT project. # # Translators: +# Arda Kılıçdağı <ardakilicdagi@gmail.com>, 2018 # Caner Başaran <basaran.caner@protonmail.com>, 2014-2016 # FIRST AUTHOR <EMAIL@ADDRESS>, 2014 msgid "" @@ -10,8 +11,8 @@ msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" "POT-Creation-Date: 2017-11-01 21:31+0100\n" -"PO-Revision-Date: 2017-11-01 20:31+0000\n" -"Last-Translator: Adam Tauber <asciimoo@gmail.com>\n" +"PO-Revision-Date: 2018-12-06 17:22+0000\n" +"Last-Translator: Arda Kılıçdağı <ardakilicdagi@gmail.com>\n" "Language-Team: Turkish (http://www.transifex.com/asciimoo/searx/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,15 +23,15 @@ msgstr "" #: searx/search.py:137 searx/search.py:182 msgid "timeout" -msgstr "" +msgstr "zaman aşımı" #: searx/search.py:144 msgid "request exception" -msgstr "" +msgstr "istekte bir hata oluştu" #: searx/search.py:151 msgid "unexpected crash" -msgstr "" +msgstr "beklenmmeyen hata" #: searx/webapp.py:136 msgid "files" @@ -74,15 +75,15 @@ msgstr "bilim" #: searx/webapp.py:399 searx/webapp.py:658 msgid "Invalid settings, please edit your preferences" -msgstr "" +msgstr "Hatalı ayar girildi, lütfen ayarlarınızı kontrol edin" #: searx/webapp.py:415 msgid "Invalid settings" -msgstr "" +msgstr "Hatalı ayar" #: searx/webapp.py:449 searx/webapp.py:493 msgid "search error" -msgstr "" +msgstr "arama hatası" #: searx/webapp.py:530 msgid "{minutes} minute(s) ago" @@ -94,27 +95,27 @@ msgstr "{hours} saat(), {minutes} dakika() önce" #: searx/answerers/random/answerer.py:53 msgid "Random value generator" -msgstr "" +msgstr "Rastgele değer üretici" #: searx/answerers/random/answerer.py:54 msgid "Generate different random values" -msgstr "" +msgstr "Farklı rastgele metinler üret" #: searx/answerers/statistics/answerer.py:53 msgid "Statistics functions" -msgstr "" +msgstr "İstatistik fonksiyonları" #: searx/answerers/statistics/answerer.py:54 msgid "Compute {functions} of the arguments" -msgstr "" +msgstr "Argümanların {functions} değerlerini hesapla" #: searx/engines/__init__.py:194 searx/engines/flycheck___init__.py:201 msgid "Engine time (sec)" -msgstr "" +msgstr "Motor cevap süresi (sn)" #: searx/engines/__init__.py:198 searx/engines/flycheck___init__.py:205 msgid "Page loads (sec)" -msgstr "Yüklenen sayfa (sn)" +msgstr "Sayfa yüklenmesi (sn)" #: searx/engines/__init__.py:202 searx/engines/flycheck___init__.py:209 #: searx/templates/oscar/results.html:95 @@ -124,11 +125,11 @@ msgstr "Sonuç sayısı" #: searx/engines/__init__.py:206 searx/engines/flycheck___init__.py:213 msgid "Scores" -msgstr "" +msgstr "Skor" #: searx/engines/__init__.py:210 searx/engines/flycheck___init__.py:217 msgid "Scores per result" -msgstr "" +msgstr "Sonuç başına skor" #: searx/engines/__init__.py:214 searx/engines/flycheck___init__.py:221 msgid "Errors" @@ -136,7 +137,7 @@ msgstr "Hatalar" #: searx/engines/pdbe.py:87 msgid "{title} (OBSOLETE)" -msgstr "" +msgstr "{title} (GEÇERSİZ)" #: searx/engines/pdbe.py:91 msgid "This entry has been superseded by" diff --git a/searx/translations/uk/LC_MESSAGES/messages.mo b/searx/translations/uk/LC_MESSAGES/messages.mo new file mode 100644 index 0000000000..6610dfaa7f Binary files /dev/null and b/searx/translations/uk/LC_MESSAGES/messages.mo differ diff --git a/searx/translations/uk/LC_MESSAGES/messages.po b/searx/translations/uk/LC_MESSAGES/messages.po new file mode 100644 index 0000000000..7c6ac5aacf --- /dev/null +++ b/searx/translations/uk/LC_MESSAGES/messages.po @@ -0,0 +1,1015 @@ +# Translations template for PROJECT. +# Copyright (C) 2017 ORGANIZATION +# This file is distributed under the same license as the PROJECT project. +# +# Translators: +# pvhn4 <pvhn4@protonmail.com>, 2017 +# pvhn4 <pvhn4@protonmail.com>, 2017 +# zubr139, 2016-2017 +msgid "" +msgstr "" +"Project-Id-Version: searx\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2017-11-01 21:31+0100\n" +"PO-Revision-Date: 2017-11-01 20:31+0000\n" +"Last-Translator: Adam Tauber <asciimoo@gmail.com>\n" +"Language-Team: Ukrainian (http://www.transifex.com/asciimoo/searx/language/uk/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 2.3.4\n" +"Language: uk\n" +"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 \|\| n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 \|\| (n % 10 >=5 && n % 10 <=9) \|\| (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);\n" + +#: searx/search.py:137 searx/search.py:182 +msgid "timeout" +msgstr "" + +#: searx/search.py:144 +msgid "request exception" +msgstr "" + +#: searx/search.py:151 +msgid "unexpected crash" +msgstr "" + +#: searx/webapp.py:136 +msgid "files" +msgstr "файли" + +#: searx/webapp.py:137 +msgid "general" +msgstr "загальні" + +#: searx/webapp.py:138 +msgid "music" +msgstr "музика" + +#: searx/webapp.py:139 +msgid "social media" +msgstr "соцмережі" + +#: searx/webapp.py:140 +msgid "images" +msgstr "зображення" + +#: searx/webapp.py:141 +msgid "videos" +msgstr "відео" + +#: searx/webapp.py:142 +msgid "it" +msgstr "IT" + +#: searx/webapp.py:143 +msgid "news" +msgstr "новини" + +#: searx/webapp.py:144 +msgid "map" +msgstr "карти" + +#: searx/webapp.py:145 +msgid "science" +msgstr "наука" + +#: searx/webapp.py:399 searx/webapp.py:658 +msgid "Invalid settings, please edit your preferences" +msgstr "Невірні налаштування, будь ласка, зробіть зміни в налаштуваннях" + +#: searx/webapp.py:415 +msgid "Invalid settings" +msgstr "" + +#: searx/webapp.py:449 searx/webapp.py:493 +msgid "search error" +msgstr "помилка пошуку" + +#: searx/webapp.py:530 +msgid "{minutes} minute(s) ago" +msgstr "{minutes} хвилин тому" + +#: searx/webapp.py:532 +msgid "{hours} hour(s), {minutes} minute(s) ago" +msgstr "{hours} годин, {minutes} хвилин тому" + +#: searx/answerers/random/answerer.py:53 +msgid "Random value generator" +msgstr "Генератор випадкових значень" + +#: searx/answerers/random/answerer.py:54 +msgid "Generate different random values" +msgstr "Створити різні випадкові значення" + +#: searx/answerers/statistics/answerer.py:53 +msgid "Statistics functions" +msgstr "Функції статистики" + +#: searx/answerers/statistics/answerer.py:54 +msgid "Compute {functions} of the arguments" +msgstr "Розрахувати {functions} аргументів" + +#: searx/engines/__init__.py:194 searx/engines/flycheck___init__.py:201 +msgid "Engine time (sec)" +msgstr "Час пошуку (сек)" + +#: searx/engines/__init__.py:198 searx/engines/flycheck___init__.py:205 +msgid "Page loads (sec)" +msgstr "Час завантадення (сек)" + +#: searx/engines/__init__.py:202 searx/engines/flycheck___init__.py:209 +#: searx/templates/oscar/results.html:95 +#: searx/templates/simple/results.html:20 +msgid "Number of results" +msgstr "Число результатів" + +#: searx/engines/__init__.py:206 searx/engines/flycheck___init__.py:213 +msgid "Scores" +msgstr "Влучань" + +#: searx/engines/__init__.py:210 searx/engines/flycheck___init__.py:217 +msgid "Scores per result" +msgstr "Влучань за результат" + +#: searx/engines/__init__.py:214 searx/engines/flycheck___init__.py:221 +msgid "Errors" +msgstr "Помилок" + +#: searx/engines/pdbe.py:87 +msgid "{title} (OBSOLETE)" +msgstr "{title} (OBSOLETE)" + +#: searx/engines/pdbe.py:91 +msgid "This entry has been superseded by" +msgstr "Цей запис був змінений" + +#: searx/engines/pubmed.py:74 +msgid "No abstract is available for this publication." +msgstr "" + +#: searx/plugins/https_rewrite.py:32 +msgid "Rewrite HTTP links to HTTPS if possible" +msgstr "За можливістю замінити в посиланнях HTTP на HTTPS" + +#: searx/plugins/infinite_scroll.py:3 +msgid "Infinite scroll" +msgstr "Нескінченна прокрутка" + +#: searx/plugins/infinite_scroll.py:4 +msgid "Automatically load next page when scrolling to bottom of current page" +msgstr "Автоматично завантажувати наступну сторінку при прокрутці поточної до кінця" + +#: searx/plugins/oa_doi_rewrite.py:9 +msgid "Open Access DOI rewrite" +msgstr "" + +#: searx/plugins/oa_doi_rewrite.py:10 +msgid "" +"Avoid paywalls by redirecting to open-access versions of publications when " +"available" +msgstr "Уникайте платіжних каналів шляхом переадресації на версії публікацій з відкритим доступом, коли це можливо" + +#: searx/plugins/open_results_on_new_tab.py:18 +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/simple/preferences.html:149 +msgid "Open result links on new browser tabs" +msgstr "Відкривати посилання результатів в нових вкладках" + +#: searx/plugins/open_results_on_new_tab.py:19 +msgid "" +"Results are opened in the same window by default. This plugin overwrites the" +" default behaviour to open links on new tabs/windows. (JavaScript required)" +msgstr "Типово результати відкриваються в тому ж вікні. Цей плагін змінює поведінку, щоб посилання відкривались типово в нових вкладках/вікнах. (Необхідний JavaScript)" + +#: searx/plugins/search_on_category_select.py:18 +msgid "Search on category select" +msgstr "Пошук по обраній категорії" + +#: searx/plugins/search_on_category_select.py:19 +msgid "" +"Perform search immediately if a category selected. Disable to select " +"multiple categories. (JavaScript required)" +msgstr "Виконувати пошук зразу при обранні категорії. Вимкнути вибір декількох категорій. (Необхідний JavaScript)" + +#: searx/plugins/self_info.py:20 +msgid "" +"Displays your IP if the query is \"ip\" and your user agent if the query " +"contains \"user agent\"." +msgstr "Відображає IP-адресу при запиті \"ip\" та ваш user-agent при запиті \"user agent\"." + +#: searx/plugins/tracker_url_remover.py:26 +msgid "Tracker URL remover" +msgstr "Видалення URL-адреси трекера" + +#: searx/plugins/tracker_url_remover.py:27 +msgid "Remove trackers arguments from the returned URL" +msgstr "Вилучіть аргументи трекера з поверненої URL-адреси" + +#: searx/plugins/vim_hotkeys.py:3 +msgid "Vim-like hotkeys" +msgstr "Гарячі клавіші Vim" + +#: searx/plugins/vim_hotkeys.py:4 +msgid "" +"Navigate search results with Vim-like hotkeys (JavaScript required). Press " +"\"h\" key on main or result page to get help." +msgstr "Переміщення результатів пошуку за допомогою віртуальних клавіш (потрібно JavaScript). Натисніть клавішу \"h\" на головній сторінці або на сторінці результатів, щоб отримати допомогу." + +#: searx/templates/courgette/404.html:4 searx/templates/legacy/404.html:4 +#: searx/templates/oscar/404.html:4 searx/templates/pix-art/404.html:4 +#: searx/templates/simple/404.html:4 +msgid "Page not found" +msgstr "Сторінка не знайдена" + +#: searx/templates/courgette/404.html:6 searx/templates/legacy/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +#: searx/templates/simple/404.html:6 +#, python-format +msgid "Go to %(search_page)s." +msgstr "Перейти до %(search_page)s." + +#: searx/templates/courgette/404.html:6 searx/templates/legacy/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +#: searx/templates/simple/404.html:6 +msgid "search page" +msgstr "сторінки пошуку" + +#: searx/templates/courgette/index.html:9 +#: searx/templates/courgette/index.html:13 +#: searx/templates/courgette/results.html:5 +#: searx/templates/legacy/index.html:8 searx/templates/legacy/index.html:12 +#: searx/templates/oscar/navbar.html:7 +#: searx/templates/oscar/preferences.html:3 +#: searx/templates/pix-art/index.html:8 +msgid "preferences" +msgstr "опції" + +#: searx/templates/courgette/index.html:11 +#: searx/templates/legacy/index.html:10 searx/templates/oscar/about.html:2 +#: searx/templates/oscar/navbar.html:6 searx/templates/pix-art/index.html:7 +msgid "about" +msgstr "про сайт" + +#: searx/templates/courgette/preferences.html:5 +#: searx/templates/legacy/preferences.html:5 +#: searx/templates/oscar/preferences.html:8 +#: searx/templates/pix-art/preferences.html:5 +#: searx/templates/simple/preferences.html:26 +msgid "Preferences" +msgstr "Опції" + +#: searx/templates/courgette/preferences.html:9 +#: searx/templates/legacy/preferences.html:9 +#: searx/templates/oscar/preferences.html:33 +#: searx/templates/oscar/preferences.html:35 +#: searx/templates/simple/preferences.html:34 +msgid "Default categories" +msgstr "Типові категорії" + +#: searx/templates/courgette/preferences.html:13 +#: searx/templates/legacy/preferences.html:14 +#: searx/templates/oscar/preferences.html:41 +#: searx/templates/pix-art/preferences.html:9 +#: searx/templates/simple/preferences.html:39 +#: searx/templates/simple/preferences.html:163 +msgid "Search language" +msgstr "Мова пошуку" + +#: searx/templates/courgette/preferences.html:16 +#: searx/templates/legacy/preferences.html:17 +#: searx/templates/oscar/languages.html:6 +#: searx/templates/pix-art/preferences.html:12 +#: searx/templates/simple/languages.html:2 +#: searx/templates/simple/preferences.html:42 +msgid "Default language" +msgstr "Стандартна мова" + +#: searx/templates/courgette/preferences.html:24 +#: searx/templates/legacy/preferences.html:25 +#: searx/templates/oscar/preferences.html:47 +#: searx/templates/pix-art/preferences.html:20 +#: searx/templates/simple/preferences.html:120 +msgid "Interface language" +msgstr "Мова інтерфейсу" + +#: searx/templates/courgette/preferences.html:34 +#: searx/templates/legacy/preferences.html:35 +#: searx/templates/oscar/preferences.html:57 +#: searx/templates/simple/preferences.html:51 +msgid "Autocomplete" +msgstr "Автозаповнення" + +#: searx/templates/courgette/preferences.html:45 +#: searx/templates/legacy/preferences.html:46 +#: searx/templates/oscar/preferences.html:68 +#: searx/templates/simple/preferences.html:166 +msgid "Image proxy" +msgstr "Проксі для зображень" + +#: searx/templates/courgette/preferences.html:48 +#: searx/templates/legacy/preferences.html:49 +#: searx/templates/oscar/preferences.html:72 +#: searx/templates/simple/preferences.html:169 +msgid "Enabled" +msgstr "Ввімкнено" + +#: searx/templates/courgette/preferences.html:49 +#: searx/templates/legacy/preferences.html:50 +#: searx/templates/oscar/preferences.html:73 +#: searx/templates/simple/preferences.html:170 +msgid "Disabled" +msgstr "Вимкнено" + +#: searx/templates/courgette/preferences.html:54 +#: searx/templates/legacy/preferences.html:55 +#: searx/templates/oscar/preferences.html:77 +#: searx/templates/pix-art/preferences.html:30 +#: searx/templates/simple/preferences.html:156 +msgid "Method" +msgstr "Метод" + +#: searx/templates/courgette/preferences.html:63 +#: searx/templates/legacy/preferences.html:64 +#: searx/templates/oscar/preferences.html:86 +#: searx/templates/oscar/preferences.html:165 +#: searx/templates/oscar/preferences.html:173 +#: searx/templates/simple/preferences.html:63 +#: searx/templates/simple/preferences.html:90 +msgid "SafeSearch" +msgstr "БезпечнийПошук" + +#: searx/templates/courgette/preferences.html:66 +#: searx/templates/legacy/preferences.html:67 +#: searx/templates/oscar/preferences.html:90 +#: searx/templates/simple/preferences.html:66 +msgid "Strict" +msgstr "Жорский" + +#: searx/templates/courgette/preferences.html:67 +#: searx/templates/legacy/preferences.html:68 +#: searx/templates/oscar/preferences.html:91 +#: searx/templates/simple/preferences.html:67 +msgid "Moderate" +msgstr "Помірний" + +#: searx/templates/courgette/preferences.html:68 +#: searx/templates/legacy/preferences.html:69 +#: searx/templates/oscar/preferences.html:92 +#: searx/templates/simple/preferences.html:68 +msgid "None" +msgstr "Вимкнений" + +#: searx/templates/courgette/preferences.html:73 +#: searx/templates/legacy/preferences.html:74 +#: searx/templates/oscar/preferences.html:96 +#: searx/templates/pix-art/preferences.html:39 +#: searx/templates/simple/preferences.html:131 +msgid "Themes" +msgstr "Теми" + +#: searx/templates/courgette/preferences.html:83 +msgid "Color" +msgstr "Колір" + +#: searx/templates/courgette/preferences.html:86 +msgid "Blue (default)" +msgstr "Синій (типово)" + +#: searx/templates/courgette/preferences.html:87 +msgid "Violet" +msgstr "Фіолетовий" + +#: searx/templates/courgette/preferences.html:88 +msgid "Green" +msgstr "Зелений" + +#: searx/templates/courgette/preferences.html:89 +msgid "Cyan" +msgstr "Блакитний" + +#: searx/templates/courgette/preferences.html:90 +msgid "Orange" +msgstr "Помаранчевий" + +#: searx/templates/courgette/preferences.html:91 +msgid "Red" +msgstr "Червоний" + +#: searx/templates/courgette/preferences.html:96 +#: searx/templates/legacy/preferences.html:93 +#: searx/templates/pix-art/preferences.html:49 +#: searx/templates/simple/preferences.html:77 +msgid "Currently used search engines" +msgstr "Пошукові системи, які використовуються" + +#: searx/templates/courgette/preferences.html:100 +#: searx/templates/legacy/preferences.html:97 +#: searx/templates/oscar/preferences.html:162 +#: searx/templates/oscar/preferences.html:176 +#: searx/templates/pix-art/preferences.html:53 +#: searx/templates/simple/preferences.html:87 +msgid "Engine name" +msgstr "Назва пошукової системи" + +#: searx/templates/courgette/preferences.html:101 +#: searx/templates/legacy/preferences.html:98 +msgid "Category" +msgstr "Категорія" + +#: searx/templates/courgette/preferences.html:102 +#: searx/templates/courgette/preferences.html:113 +#: searx/templates/legacy/preferences.html:99 +#: searx/templates/legacy/preferences.html:110 +#: searx/templates/oscar/preferences.html:161 +#: searx/templates/oscar/preferences.html:177 +#: searx/templates/pix-art/preferences.html:54 +#: searx/templates/pix-art/preferences.html:64 +#: searx/templates/simple/preferences.html:86 +msgid "Allow" +msgstr "Дозволити" + +#: searx/templates/courgette/preferences.html:102 +#: searx/templates/courgette/preferences.html:114 +#: searx/templates/legacy/preferences.html:99 +#: searx/templates/legacy/preferences.html:111 +#: searx/templates/pix-art/preferences.html:54 +#: searx/templates/pix-art/preferences.html:65 +msgid "Block" +msgstr "Заблокувати" + +#: searx/templates/courgette/preferences.html:122 +#: searx/templates/legacy/preferences.html:119 +#: searx/templates/oscar/preferences.html:297 +#: searx/templates/pix-art/preferences.html:73 +#: searx/templates/simple/preferences.html:180 +msgid "" +"These settings are stored in your cookies, this allows us not to store this " +"data about you." +msgstr "Налаштування зберігаються в ваших cookie-файлах, що дає нам змогу не зберігати ці відомості про вас." + +#: searx/templates/courgette/preferences.html:124 +#: searx/templates/legacy/preferences.html:121 +#: searx/templates/oscar/preferences.html:299 +#: searx/templates/pix-art/preferences.html:75 +#: searx/templates/simple/preferences.html:182 +msgid "" +"These cookies serve your sole convenience, we don't use these cookies to " +"track you." +msgstr "Ці cookie-файли необхідні винятково для вашої зручності, ми не використовуємо ці cookie-файли, щоб відслідковувати вас." + +#: searx/templates/courgette/preferences.html:127 +#: searx/templates/legacy/preferences.html:124 +#: searx/templates/oscar/preferences.html:305 +#: searx/templates/pix-art/preferences.html:78 +#: searx/templates/simple/preferences.html:185 +msgid "save" +msgstr "зберегти" + +#: searx/templates/courgette/preferences.html:128 +#: searx/templates/legacy/preferences.html:125 +#: searx/templates/oscar/preferences.html:307 +#: searx/templates/simple/preferences.html:186 +msgid "Reset defaults" +msgstr "Відновити стандартні налаштування" + +#: searx/templates/courgette/preferences.html:129 +#: searx/templates/legacy/preferences.html:126 +#: searx/templates/oscar/preferences.html:306 +#: searx/templates/pix-art/preferences.html:79 +#: searx/templates/simple/preferences.html:187 +msgid "back" +msgstr "назад" + +#: searx/templates/courgette/results.html:12 +#: searx/templates/legacy/results.html:13 +#: searx/templates/oscar/results.html:136 +#: searx/templates/simple/results.html:58 +msgid "Search URL" +msgstr "Посилання на пошук" + +#: searx/templates/courgette/results.html:16 +#: searx/templates/legacy/results.html:17 +#: searx/templates/oscar/results.html:141 +#: searx/templates/simple/results.html:62 +msgid "Download results" +msgstr "Завантажити результати" + +#: searx/templates/courgette/results.html:34 +#: searx/templates/legacy/results.html:35 +#: searx/templates/simple/results.html:10 +msgid "Answers" +msgstr "Відповіді" + +#: searx/templates/courgette/results.html:42 +#: searx/templates/legacy/results.html:43 +#: searx/templates/oscar/results.html:116 +#: searx/templates/simple/results.html:42 +msgid "Suggestions" +msgstr "Пропозиції" + +#: searx/templates/courgette/results.html:70 +#: searx/templates/legacy/results.html:81 +#: searx/templates/oscar/results.html:68 searx/templates/oscar/results.html:78 +#: searx/templates/simple/results.html:130 +msgid "previous page" +msgstr "попередня сторінка" + +#: searx/templates/courgette/results.html:81 +#: searx/templates/legacy/results.html:92 +#: searx/templates/oscar/results.html:62 searx/templates/oscar/results.html:84 +#: searx/templates/simple/results.html:145 +msgid "next page" +msgstr "наступна сторінка" + +#: searx/templates/courgette/search.html:3 +#: searx/templates/legacy/search.html:3 searx/templates/oscar/search.html:6 +#: searx/templates/oscar/search_full.html:9 +#: searx/templates/pix-art/search.html:3 searx/templates/simple/search.html:4 +msgid "Search for..." +msgstr "Шукати..." + +#: searx/templates/courgette/stats.html:4 searx/templates/legacy/stats.html:4 +#: searx/templates/oscar/stats.html:5 searx/templates/pix-art/stats.html:4 +#: searx/templates/simple/stats.html:7 +msgid "Engine stats" +msgstr "Статистика пошукової системи" + +#: searx/templates/courgette/result_templates/images.html:4 +#: searx/templates/legacy/result_templates/images.html:4 +#: searx/templates/pix-art/result_templates/images.html:4 +msgid "original context" +msgstr "в контексті" + +#: searx/templates/courgette/result_templates/torrent.html:7 +#: searx/templates/legacy/result_templates/torrent.html:11 +#: searx/templates/oscar/result_templates/torrent.html:6 +#: searx/templates/simple/result_templates/torrent.html:9 +msgid "Seeder" +msgstr "Сідер" + +#: searx/templates/courgette/result_templates/torrent.html:7 +#: searx/templates/legacy/result_templates/torrent.html:11 +#: searx/templates/oscar/result_templates/torrent.html:6 +#: searx/templates/simple/result_templates/torrent.html:9 +msgid "Leecher" +msgstr "Лічер" + +#: searx/templates/courgette/result_templates/torrent.html:9 +#: searx/templates/legacy/result_templates/torrent.html:9 +#: searx/templates/oscar/macros.html:23 +#: searx/templates/simple/result_templates/torrent.html:6 +msgid "magnet link" +msgstr "магнет-посилання" + +#: searx/templates/courgette/result_templates/torrent.html:10 +#: searx/templates/legacy/result_templates/torrent.html:10 +#: searx/templates/oscar/macros.html:24 +#: searx/templates/simple/result_templates/torrent.html:7 +msgid "torrent file" +msgstr "торрент-файл" + +#: searx/templates/legacy/categories.html:8 +#: searx/templates/simple/categories.html:6 +msgid "Click on the magnifier to perform search" +msgstr "Натисніть лупу, щоб виконати пошук" + +#: searx/templates/legacy/preferences.html:84 +#: searx/templates/oscar/preferences.html:113 +#: searx/templates/simple/preferences.html:142 +msgid "Results on new tabs" +msgstr "Результати в нових вкладках" + +#: searx/templates/legacy/preferences.html:87 +#: searx/templates/oscar/preferences.html:117 +#: searx/templates/simple/preferences.html:145 +msgid "On" +msgstr "Ввімк." + +#: searx/templates/legacy/preferences.html:88 +#: searx/templates/oscar/preferences.html:118 +#: searx/templates/simple/preferences.html:146 +msgid "Off" +msgstr "Вимк." + +#: searx/templates/legacy/result_templates/code.html:3 +#: searx/templates/legacy/result_templates/default.html:3 +#: searx/templates/legacy/result_templates/map.html:9 +#: searx/templates/oscar/macros.html:34 searx/templates/oscar/macros.html:48 +#: searx/templates/simple/macros.html:43 +msgid "cached" +msgstr "архівовано" + +#: searx/templates/oscar/advanced.html:4 +msgid "Advanced settings" +msgstr "Додаткові налаштування" + +#: searx/templates/oscar/base.html:62 +#: searx/templates/oscar/messages/first_time.html:4 +#: searx/templates/oscar/messages/save_settings_successfull.html:5 +#: searx/templates/oscar/messages/unknow_error.html:5 +msgid "Close" +msgstr "Закрити" + +#: searx/templates/oscar/base.html:64 +#: searx/templates/oscar/messages/no_results.html:4 +#: searx/templates/simple/messages/no_results.html:4 +#: searx/templates/simple/results.html:25 +msgid "Error!" +msgstr "Помилка!" + +#: searx/templates/oscar/base.html:90 searx/templates/simple/base.html:55 +msgid "Powered by" +msgstr "Використовується" + +#: searx/templates/oscar/base.html:90 searx/templates/simple/base.html:55 +msgid "a privacy-respecting, hackable metasearch engine" +msgstr "вільна система метапошуку, яка поважає вашу приватність" + +#: searx/templates/oscar/macros.html:36 searx/templates/oscar/macros.html:50 +#: searx/templates/simple/macros.html:43 +msgid "proxied" +msgstr "проксовано" + +#: searx/templates/oscar/macros.html:92 +msgid "supported" +msgstr "" + +#: searx/templates/oscar/macros.html:96 +msgid "not supported" +msgstr "" + +#: searx/templates/oscar/preferences.html:13 +#: searx/templates/oscar/preferences.html:22 +#: searx/templates/simple/preferences.html:32 +msgid "General" +msgstr "Загальні" + +#: searx/templates/oscar/preferences.html:14 +#: searx/templates/oscar/preferences.html:146 +#: searx/templates/simple/preferences.html:76 +msgid "Engines" +msgstr "Пошукові системи" + +#: searx/templates/oscar/preferences.html:15 +#: searx/templates/oscar/preferences.html:219 +msgid "Plugins" +msgstr "Плагіни" + +#: searx/templates/oscar/preferences.html:16 +#: searx/templates/oscar/preferences.html:245 +msgid "Answerers" +msgstr "Відповідачі" + +#: searx/templates/oscar/preferences.html:17 +#: searx/templates/oscar/preferences.html:272 +msgid "Cookies" +msgstr "Cookie-файли" + +#: searx/templates/oscar/preferences.html:42 +#: searx/templates/simple/preferences.html:48 +msgid "What language do you prefer for search?" +msgstr "Якій мові ви віддаєте перевагу для пошуку?" + +#: searx/templates/oscar/preferences.html:48 +#: searx/templates/simple/preferences.html:128 +msgid "Change the language of the layout" +msgstr "Змінити мову сайту" + +#: searx/templates/oscar/preferences.html:58 +#: searx/templates/simple/preferences.html:60 +msgid "Find stuff as you type" +msgstr "Шукати підчас набору" + +#: searx/templates/oscar/preferences.html:69 +#: searx/templates/simple/preferences.html:173 +msgid "Proxying image results through searx" +msgstr "Проксувати знайдені зображення за допомогою searx" + +#: searx/templates/oscar/preferences.html:78 +msgid "" +"Change how forms are submited, <a " +"href=\"http://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods\"" +" rel=\"external\">learn more about request methods</a>" +msgstr "Змінити спосіб відправки запитів, <a href=\"http://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods\" rel=\"external\">детальніше про методи запитів</a>" + +#: searx/templates/oscar/preferences.html:87 +#: searx/templates/simple/preferences.html:71 +msgid "Filter content" +msgstr "Фільтр контенту" + +#: searx/templates/oscar/preferences.html:97 +#: searx/templates/simple/preferences.html:139 +msgid "Change searx layout" +msgstr "Змінити вигляд сайту" + +#: searx/templates/oscar/preferences.html:106 +#: searx/templates/oscar/preferences.html:111 +msgid "Choose style for this theme" +msgstr "Обрати стиль для цієї теми" + +#: searx/templates/oscar/preferences.html:106 +#: searx/templates/oscar/preferences.html:111 +msgid "Style" +msgstr "Стиль" + +#: searx/templates/oscar/preferences.html:122 +msgid "Open Access DOI resolver" +msgstr "" + +#: searx/templates/oscar/preferences.html:123 +msgid "" +"Redirect to open-access versions of publications when available (plugin " +"required)" +msgstr "" + +#: searx/templates/oscar/preferences.html:163 +#: searx/templates/oscar/preferences.html:175 +#: searx/templates/simple/preferences.html:88 +msgid "Shortcut" +msgstr "Гарячі клавіші" + +#: searx/templates/oscar/preferences.html:164 +#: searx/templates/oscar/preferences.html:174 +msgid "Selected language" +msgstr "" + +#: searx/templates/oscar/preferences.html:166 +#: searx/templates/oscar/preferences.html:172 +#: searx/templates/simple/preferences.html:91 +msgid "Time range" +msgstr "Часовий діапазон" + +#: searx/templates/oscar/preferences.html:167 +#: searx/templates/oscar/preferences.html:171 +#: searx/templates/simple/preferences.html:92 +msgid "Avg. time" +msgstr "Середній час" + +#: searx/templates/oscar/preferences.html:168 +#: searx/templates/oscar/preferences.html:170 +#: searx/templates/simple/preferences.html:93 +msgid "Max time" +msgstr "Максимальний час" + +#: searx/templates/oscar/preferences.html:248 +msgid "This is the list of searx's instant answering modules." +msgstr "Список модулів миттєвих відповідей searx." + +#: searx/templates/oscar/preferences.html:252 +msgid "Name" +msgstr "Назва" + +#: searx/templates/oscar/preferences.html:253 +msgid "Keywords" +msgstr "Ключові слова" + +#: searx/templates/oscar/preferences.html:254 +msgid "Description" +msgstr "Опис" + +#: searx/templates/oscar/preferences.html:255 +msgid "Examples" +msgstr "Приклади" + +#: searx/templates/oscar/preferences.html:275 +msgid "" +"This is the list of cookies and their values searx is storing on your " +"computer." +msgstr "Це список cookie-файлів та їх значень, які searx зберігає на вашому комп'ютері." + +#: searx/templates/oscar/preferences.html:276 +msgid "With that list, you can assess searx transparency." +msgstr "По цьому списку ви можете оцінити відкритість searx." + +#: searx/templates/oscar/preferences.html:281 +msgid "Cookie name" +msgstr "Ім'я cookie" + +#: searx/templates/oscar/preferences.html:282 +msgid "Value" +msgstr "Значення" + +#: searx/templates/oscar/preferences.html:301 +msgid "Search URL of the currently saved preferences" +msgstr "" + +#: searx/templates/oscar/preferences.html:301 +msgid "" +"Note: specifying custom settings in the search URL can reduce privacy by " +"leaking data to the clicked result sites." +msgstr "" + +#: searx/templates/oscar/results.html:17 +msgid "Search results" +msgstr "Результати пошуку" + +#: searx/templates/oscar/results.html:21 +#: searx/templates/simple/results.html:84 +msgid "Try searching for:" +msgstr "" + +#: searx/templates/oscar/results.html:100 +#: searx/templates/simple/results.html:25 +msgid "Engines cannot retrieve results" +msgstr "" + +#: searx/templates/oscar/results.html:131 +msgid "Links" +msgstr "Посилання" + +#: searx/templates/oscar/search.html:8 +#: searx/templates/oscar/search_full.html:11 +#: searx/templates/simple/search.html:5 +msgid "Start search" +msgstr "Розпочати пошук" + +#: searx/templates/oscar/stats.html:2 +msgid "stats" +msgstr "статистика" + +#: searx/templates/oscar/time-range.html:3 +#: searx/templates/simple/time-range.html:3 +msgid "Anytime" +msgstr "За весь час" + +#: searx/templates/oscar/time-range.html:6 +#: searx/templates/simple/time-range.html:6 +msgid "Last day" +msgstr "За останній день" + +#: searx/templates/oscar/time-range.html:9 +#: searx/templates/simple/time-range.html:9 +msgid "Last week" +msgstr "За останній тиждень" + +#: searx/templates/oscar/time-range.html:12 +#: searx/templates/simple/time-range.html:12 +msgid "Last month" +msgstr "За останній місяць" + +#: searx/templates/oscar/time-range.html:15 +#: searx/templates/simple/time-range.html:15 +msgid "Last year" +msgstr "За останній рік" + +#: searx/templates/oscar/messages/first_time.html:6 +#: searx/templates/oscar/messages/no_data_available.html:3 +msgid "Heads up!" +msgstr "Отакої!" + +#: searx/templates/oscar/messages/first_time.html:7 +msgid "It look like you are using searx first time." +msgstr "Схоже, що ви використовуєте searx вперше." + +#: searx/templates/oscar/messages/no_cookies.html:3 +msgid "Information!" +msgstr "Інформація!" + +#: searx/templates/oscar/messages/no_cookies.html:4 +msgid "currently, there are no cookies defined." +msgstr "в даний час cookie-файли не встановлені." + +#: searx/templates/oscar/messages/no_data_available.html:4 +msgid "There is currently no data available. " +msgstr "В даний час немає доступних даних." + +#: searx/templates/oscar/messages/no_results.html:4 +#: searx/templates/simple/messages/no_results.html:4 +msgid "Engines cannot retrieve results." +msgstr "" + +#: searx/templates/oscar/messages/no_results.html:10 +#: searx/templates/simple/messages/no_results.html:10 +msgid "Please, try again later or find another searx instance." +msgstr "" + +#: searx/templates/oscar/messages/no_results.html:14 +#: searx/templates/simple/messages/no_results.html:14 +msgid "Sorry!" +msgstr "Вибачте!" + +#: searx/templates/oscar/messages/no_results.html:15 +#: searx/templates/simple/messages/no_results.html:15 +msgid "" +"we didn't find any results. Please use another query or search in more " +"categories." +msgstr "ми не знайшли жодних результатів. Будь ласка, використайте інший запит або виконайте пошук в декількох категоріях." + +#: searx/templates/oscar/messages/save_settings_successfull.html:7 +msgid "Well done!" +msgstr "Чудово!" + +#: searx/templates/oscar/messages/save_settings_successfull.html:8 +msgid "Settings saved successfully." +msgstr "Налаштування успішно збережені." + +#: searx/templates/oscar/messages/unknow_error.html:7 +msgid "Oh snap!" +msgstr "От халепа!" + +#: searx/templates/oscar/messages/unknow_error.html:8 +msgid "Something went wrong." +msgstr "Щось пішло не так." + +#: searx/templates/oscar/result_templates/default.html:7 +#: searx/templates/simple/result_templates/default.html:6 +msgid "show media" +msgstr "показати медіа" + +#: searx/templates/oscar/result_templates/default.html:7 +#: searx/templates/simple/result_templates/default.html:6 +msgid "hide media" +msgstr "приховати медіа" + +#: searx/templates/oscar/result_templates/images.html:30 +msgid "Get image" +msgstr "Завантажити зображення" + +#: searx/templates/oscar/result_templates/images.html:33 +msgid "View source" +msgstr "Переглянути джерело" + +#: searx/templates/oscar/result_templates/map.html:7 +#: searx/templates/simple/result_templates/map.html:7 +msgid "show map" +msgstr "показати карту" + +#: searx/templates/oscar/result_templates/map.html:7 +#: searx/templates/simple/result_templates/map.html:7 +msgid "hide map" +msgstr "приховати карту" + +#: searx/templates/oscar/result_templates/map.html:11 +#: searx/templates/simple/result_templates/map.html:11 +msgid "show details" +msgstr "показати деталі" + +#: searx/templates/oscar/result_templates/map.html:11 +#: searx/templates/simple/result_templates/map.html:11 +msgid "hide details" +msgstr "приховати деталі" + +#: searx/templates/oscar/result_templates/torrent.html:7 +#: searx/templates/simple/result_templates/torrent.html:11 +msgid "Filesize" +msgstr "Розмір файла" + +#: searx/templates/oscar/result_templates/torrent.html:9 +#: searx/templates/simple/result_templates/torrent.html:12 +msgid "Bytes" +msgstr "Байтів" + +#: searx/templates/oscar/result_templates/torrent.html:10 +#: searx/templates/simple/result_templates/torrent.html:13 +msgid "kiB" +msgstr "КіБ" + +#: searx/templates/oscar/result_templates/torrent.html:11 +#: searx/templates/simple/result_templates/torrent.html:14 +msgid "MiB" +msgstr "МіБ" + +#: searx/templates/oscar/result_templates/torrent.html:12 +#: searx/templates/simple/result_templates/torrent.html:15 +msgid "GiB" +msgstr "ГіБ" + +#: searx/templates/oscar/result_templates/torrent.html:13 +#: searx/templates/simple/result_templates/torrent.html:16 +msgid "TiB" +msgstr "ТіБ" + +#: searx/templates/oscar/result_templates/torrent.html:15 +#: searx/templates/simple/result_templates/torrent.html:20 +msgid "Number of Files" +msgstr "Кількість Файлів" + +#: searx/templates/oscar/result_templates/videos.html:7 +#: searx/templates/simple/result_templates/videos.html:6 +msgid "show video" +msgstr "показати відео" + +#: searx/templates/oscar/result_templates/videos.html:7 +#: searx/templates/simple/result_templates/videos.html:6 +msgid "hide video" +msgstr "приховати відео" + +#: searx/templates/pix-art/results.html:28 +msgid "Load more..." +msgstr "Завантажити більше..." + +#: searx/templates/simple/base.html:31 +msgid "No item found" +msgstr "" + +#: searx/templates/simple/preferences.html:89 +msgid "Supports selected language" +msgstr "Підтримка обраної мови" + +#: searx/templates/simple/preferences.html:118 +msgid "User interface" +msgstr "" + +#: searx/templates/simple/preferences.html:154 +msgid "Privacy" +msgstr "" diff --git a/searx/translations/vi/LC_MESSAGES/messages.mo b/searx/translations/vi/LC_MESSAGES/messages.mo new file mode 100644 index 0000000000..07dc309ea2 Binary files /dev/null and b/searx/translations/vi/LC_MESSAGES/messages.mo differ diff --git a/searx/translations/vi/LC_MESSAGES/messages.po b/searx/translations/vi/LC_MESSAGES/messages.po new file mode 100644 index 0000000000..d8a1a0c943 --- /dev/null +++ b/searx/translations/vi/LC_MESSAGES/messages.po @@ -0,0 +1,1013 @@ +# Translations template for PROJECT. +# Copyright (C) 2017 ORGANIZATION +# This file is distributed under the same license as the PROJECT project. +# +# Translators: +# dd721411 <dd721411@gmail.com>, 2018 +msgid "" +msgstr "" +"Project-Id-Version: searx\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2017-11-01 21:31+0100\n" +"PO-Revision-Date: 2018-02-28 17:27+0000\n" +"Last-Translator: dd721411 <dd721411@gmail.com>\n" +"Language-Team: Vietnamese (http://www.transifex.com/asciimoo/searx/language/vi/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 2.3.4\n" +"Language: vi\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: searx/search.py:137 searx/search.py:182 +msgid "timeout" +msgstr "hết thời hạn" + +#: searx/search.py:144 +msgid "request exception" +msgstr "ngoại lệ yêu cầu" + +#: searx/search.py:151 +msgid "unexpected crash" +msgstr "lỗi bất ngờ" + +#: searx/webapp.py:136 +msgid "files" +msgstr "các tập tin" + +#: searx/webapp.py:137 +msgid "general" +msgstr "tổng quát" + +#: searx/webapp.py:138 +msgid "music" +msgstr "âm nhạc" + +#: searx/webapp.py:139 +msgid "social media" +msgstr "mạng xã hội" + +#: searx/webapp.py:140 +msgid "images" +msgstr "hình ảnh" + +#: searx/webapp.py:141 +msgid "videos" +msgstr "phim" + +#: searx/webapp.py:142 +msgid "it" +msgstr "CNTT" + +#: searx/webapp.py:143 +msgid "news" +msgstr "tin tức" + +#: searx/webapp.py:144 +msgid "map" +msgstr "bản đồ" + +#: searx/webapp.py:145 +msgid "science" +msgstr "khoa học" + +#: searx/webapp.py:399 searx/webapp.py:658 +msgid "Invalid settings, please edit your preferences" +msgstr "Cài đặt không hợp lệ, xin xem lại tuỳ chỉnh" + +#: searx/webapp.py:415 +msgid "Invalid settings" +msgstr "Cài đặt không hợp lệ" + +#: searx/webapp.py:449 searx/webapp.py:493 +msgid "search error" +msgstr "lỗi tìm kiếm" + +#: searx/webapp.py:530 +msgid "{minutes} minute(s) ago" +msgstr "{minutes} phút() trước" + +#: searx/webapp.py:532 +msgid "{hours} hour(s), {minutes} minute(s) ago" +msgstr "{hours} giờ(), {minutes} phút() trước" + +#: searx/answerers/random/answerer.py:53 +msgid "Random value generator" +msgstr "Trình tạo giá trị ngẫu nhiên" + +#: searx/answerers/random/answerer.py:54 +msgid "Generate different random values" +msgstr "Tạo các giá trị ngẫu nhiên khác nhau" + +#: searx/answerers/statistics/answerer.py:53 +msgid "Statistics functions" +msgstr "Các hàm thống kê" + +#: searx/answerers/statistics/answerer.py:54 +msgid "Compute {functions} of the arguments" +msgstr "Tính toán {functions} của các đối số" + +#: searx/engines/__init__.py:194 searx/engines/flycheck___init__.py:201 +msgid "Engine time (sec)" +msgstr "Thời gian trình tìm kiếm (giây)" + +#: searx/engines/__init__.py:198 searx/engines/flycheck___init__.py:205 +msgid "Page loads (sec)" +msgstr "Tải trang (giây)" + +#: searx/engines/__init__.py:202 searx/engines/flycheck___init__.py:209 +#: searx/templates/oscar/results.html:95 +#: searx/templates/simple/results.html:20 +msgid "Number of results" +msgstr "Số lượng kết quả" + +#: searx/engines/__init__.py:206 searx/engines/flycheck___init__.py:213 +msgid "Scores" +msgstr "Điểm số" + +#: searx/engines/__init__.py:210 searx/engines/flycheck___init__.py:217 +msgid "Scores per result" +msgstr "Điểm số cho từng kết quả" + +#: searx/engines/__init__.py:214 searx/engines/flycheck___init__.py:221 +msgid "Errors" +msgstr "Các lỗi" + +#: searx/engines/pdbe.py:87 +msgid "{title} (OBSOLETE)" +msgstr "{title} (LỖI THỜI)" + +#: searx/engines/pdbe.py:91 +msgid "This entry has been superseded by" +msgstr "Mục này đã được thay thế bởi" + +#: searx/engines/pubmed.py:74 +msgid "No abstract is available for this publication." +msgstr "Không có bản tóm tắt nào cho ấn phẩm này." + +#: searx/plugins/https_rewrite.py:32 +msgid "Rewrite HTTP links to HTTPS if possible" +msgstr "Viết lại các liên kết HTTP thành HTTPS khi có thể" + +#: searx/plugins/infinite_scroll.py:3 +msgid "Infinite scroll" +msgstr "Cuộn liên tục" + +#: searx/plugins/infinite_scroll.py:4 +msgid "Automatically load next page when scrolling to bottom of current page" +msgstr "Tự động tải trang kế tiếp khi cuộn đến cuối trang hiện tại" + +#: searx/plugins/oa_doi_rewrite.py:9 +msgid "Open Access DOI rewrite" +msgstr "Viết lại DOI Truy Cập Miễn Phí" + +#: searx/plugins/oa_doi_rewrite.py:10 +msgid "" +"Avoid paywalls by redirecting to open-access versions of publications when " +"available" +msgstr "Tránh việc trả phí bằng cách chuyển hướng đến các phiên bản truy cập miễn phí của ấn phẩm khi có thể" + +#: searx/plugins/open_results_on_new_tab.py:18 +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/simple/preferences.html:149 +msgid "Open result links on new browser tabs" +msgstr "Mở kết quả trên những thẻ trình duyệt mới" + +#: searx/plugins/open_results_on_new_tab.py:19 +msgid "" +"Results are opened in the same window by default. This plugin overwrites the" +" default behaviour to open links on new tabs/windows. (JavaScript required)" +msgstr "Theo mặc định thì các kết quả được mở trên cùng một cửa sổ. Phần mở rộng này sẽ ghi đè lên hành vi mặc định đó để mở các liên kết trên các thẻ/cửa sổ mới. (yêu cầu JavaScript)" + +#: searx/plugins/search_on_category_select.py:18 +msgid "Search on category select" +msgstr "Tìm kiếm khi chọn danh mục đơn" + +#: searx/plugins/search_on_category_select.py:19 +msgid "" +"Perform search immediately if a category selected. Disable to select " +"multiple categories. (JavaScript required)" +msgstr "Thực thi tìm kiếm ngay khi chọn một danh mục. Tắt đi để chọn nhiều danh mục. (yêu cầu JavaScript)" + +#: searx/plugins/self_info.py:20 +msgid "" +"Displays your IP if the query is \"ip\" and your user agent if the query " +"contains \"user agent\"." +msgstr "Hiện IP của bạn khi gõ \"ip\" và hiện user agent khi gõ \"user agent\"." + +#: searx/plugins/tracker_url_remover.py:26 +msgid "Tracker URL remover" +msgstr "Trình loại bỏ URL theo dõi" + +#: searx/plugins/tracker_url_remover.py:27 +msgid "Remove trackers arguments from the returned URL" +msgstr "Loại bỏ các đối số theo dõi từ URL trả về" + +#: searx/plugins/vim_hotkeys.py:3 +msgid "Vim-like hotkeys" +msgstr "Các phím tắt Vim-like" + +#: searx/plugins/vim_hotkeys.py:4 +msgid "" +"Navigate search results with Vim-like hotkeys (JavaScript required). Press " +"\"h\" key on main or result page to get help." +msgstr "Điều hướng các kết quả tìm kiếm với các phím tắt Vim-like (yêu cầu JavaScript). Nhấn phím \"h\" trên trang chính hoặc trang kết quả để xem trợ giúp." + +#: searx/templates/courgette/404.html:4 searx/templates/legacy/404.html:4 +#: searx/templates/oscar/404.html:4 searx/templates/pix-art/404.html:4 +#: searx/templates/simple/404.html:4 +msgid "Page not found" +msgstr "Không tìm thấy trang" + +#: searx/templates/courgette/404.html:6 searx/templates/legacy/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +#: searx/templates/simple/404.html:6 +#, python-format +msgid "Go to %(search_page)s." +msgstr "Đi đến %(search_page)s." + +#: searx/templates/courgette/404.html:6 searx/templates/legacy/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +#: searx/templates/simple/404.html:6 +msgid "search page" +msgstr "tìm kiếm trang" + +#: searx/templates/courgette/index.html:9 +#: searx/templates/courgette/index.html:13 +#: searx/templates/courgette/results.html:5 +#: searx/templates/legacy/index.html:8 searx/templates/legacy/index.html:12 +#: searx/templates/oscar/navbar.html:7 +#: searx/templates/oscar/preferences.html:3 +#: searx/templates/pix-art/index.html:8 +msgid "preferences" +msgstr "tuỳ chỉnh" + +#: searx/templates/courgette/index.html:11 +#: searx/templates/legacy/index.html:10 searx/templates/oscar/about.html:2 +#: searx/templates/oscar/navbar.html:6 searx/templates/pix-art/index.html:7 +msgid "about" +msgstr "thông tin về" + +#: searx/templates/courgette/preferences.html:5 +#: searx/templates/legacy/preferences.html:5 +#: searx/templates/oscar/preferences.html:8 +#: searx/templates/pix-art/preferences.html:5 +#: searx/templates/simple/preferences.html:26 +msgid "Preferences" +msgstr "Tuỳ chỉnh" + +#: searx/templates/courgette/preferences.html:9 +#: searx/templates/legacy/preferences.html:9 +#: searx/templates/oscar/preferences.html:33 +#: searx/templates/oscar/preferences.html:35 +#: searx/templates/simple/preferences.html:34 +msgid "Default categories" +msgstr "Các danh mục mặc định" + +#: searx/templates/courgette/preferences.html:13 +#: searx/templates/legacy/preferences.html:14 +#: searx/templates/oscar/preferences.html:41 +#: searx/templates/pix-art/preferences.html:9 +#: searx/templates/simple/preferences.html:39 +#: searx/templates/simple/preferences.html:163 +msgid "Search language" +msgstr "Ngôn ngữ tìm kiếm" + +#: searx/templates/courgette/preferences.html:16 +#: searx/templates/legacy/preferences.html:17 +#: searx/templates/oscar/languages.html:6 +#: searx/templates/pix-art/preferences.html:12 +#: searx/templates/simple/languages.html:2 +#: searx/templates/simple/preferences.html:42 +msgid "Default language" +msgstr "Ngôn ngữ mặc định" + +#: searx/templates/courgette/preferences.html:24 +#: searx/templates/legacy/preferences.html:25 +#: searx/templates/oscar/preferences.html:47 +#: searx/templates/pix-art/preferences.html:20 +#: searx/templates/simple/preferences.html:120 +msgid "Interface language" +msgstr "Ngôn ngữ giao diện" + +#: searx/templates/courgette/preferences.html:34 +#: searx/templates/legacy/preferences.html:35 +#: searx/templates/oscar/preferences.html:57 +#: searx/templates/simple/preferences.html:51 +msgid "Autocomplete" +msgstr "Gợi ý tự động" + +#: searx/templates/courgette/preferences.html:45 +#: searx/templates/legacy/preferences.html:46 +#: searx/templates/oscar/preferences.html:68 +#: searx/templates/simple/preferences.html:166 +msgid "Image proxy" +msgstr "Proxy hình ảnh" + +#: searx/templates/courgette/preferences.html:48 +#: searx/templates/legacy/preferences.html:49 +#: searx/templates/oscar/preferences.html:72 +#: searx/templates/simple/preferences.html:169 +msgid "Enabled" +msgstr "Đã " + +#: searx/templates/courgette/preferences.html:49 +#: searx/templates/legacy/preferences.html:50 +#: searx/templates/oscar/preferences.html:73 +#: searx/templates/simple/preferences.html:170 +msgid "Disabled" +msgstr "Đã tắt" + +#: searx/templates/courgette/preferences.html:54 +#: searx/templates/legacy/preferences.html:55 +#: searx/templates/oscar/preferences.html:77 +#: searx/templates/pix-art/preferences.html:30 +#: searx/templates/simple/preferences.html:156 +msgid "Method" +msgstr "Phương pháp" + +#: searx/templates/courgette/preferences.html:63 +#: searx/templates/legacy/preferences.html:64 +#: searx/templates/oscar/preferences.html:86 +#: searx/templates/oscar/preferences.html:165 +#: searx/templates/oscar/preferences.html:173 +#: searx/templates/simple/preferences.html:63 +#: searx/templates/simple/preferences.html:90 +msgid "SafeSearch" +msgstr "Tìm Kiếm An Toàn" + +#: searx/templates/courgette/preferences.html:66 +#: searx/templates/legacy/preferences.html:67 +#: searx/templates/oscar/preferences.html:90 +#: searx/templates/simple/preferences.html:66 +msgid "Strict" +msgstr "Nghiêm ngặt" + +#: searx/templates/courgette/preferences.html:67 +#: searx/templates/legacy/preferences.html:68 +#: searx/templates/oscar/preferences.html:91 +#: searx/templates/simple/preferences.html:67 +msgid "Moderate" +msgstr "Vừa phải" + +#: searx/templates/courgette/preferences.html:68 +#: searx/templates/legacy/preferences.html:69 +#: searx/templates/oscar/preferences.html:92 +#: searx/templates/simple/preferences.html:68 +msgid "None" +msgstr "Không" + +#: searx/templates/courgette/preferences.html:73 +#: searx/templates/legacy/preferences.html:74 +#: searx/templates/oscar/preferences.html:96 +#: searx/templates/pix-art/preferences.html:39 +#: searx/templates/simple/preferences.html:131 +msgid "Themes" +msgstr "Nền" + +#: searx/templates/courgette/preferences.html:83 +msgid "Color" +msgstr "Màu sắc" + +#: searx/templates/courgette/preferences.html:86 +msgid "Blue (default)" +msgstr "Xanh lam (mặc định)" + +#: searx/templates/courgette/preferences.html:87 +msgid "Violet" +msgstr "Tím" + +#: searx/templates/courgette/preferences.html:88 +msgid "Green" +msgstr "Xanh lục" + +#: searx/templates/courgette/preferences.html:89 +msgid "Cyan" +msgstr "Lục lam" + +#: searx/templates/courgette/preferences.html:90 +msgid "Orange" +msgstr "Cam" + +#: searx/templates/courgette/preferences.html:91 +msgid "Red" +msgstr "Đỏ" + +#: searx/templates/courgette/preferences.html:96 +#: searx/templates/legacy/preferences.html:93 +#: searx/templates/pix-art/preferences.html:49 +#: searx/templates/simple/preferences.html:77 +msgid "Currently used search engines" +msgstr "Các trình tìm kiếm đang được dùng" + +#: searx/templates/courgette/preferences.html:100 +#: searx/templates/legacy/preferences.html:97 +#: searx/templates/oscar/preferences.html:162 +#: searx/templates/oscar/preferences.html:176 +#: searx/templates/pix-art/preferences.html:53 +#: searx/templates/simple/preferences.html:87 +msgid "Engine name" +msgstr "Tên trình tìm kiếm" + +#: searx/templates/courgette/preferences.html:101 +#: searx/templates/legacy/preferences.html:98 +msgid "Category" +msgstr "Danh mục" + +#: searx/templates/courgette/preferences.html:102 +#: searx/templates/courgette/preferences.html:113 +#: searx/templates/legacy/preferences.html:99 +#: searx/templates/legacy/preferences.html:110 +#: searx/templates/oscar/preferences.html:161 +#: searx/templates/oscar/preferences.html:177 +#: searx/templates/pix-art/preferences.html:54 +#: searx/templates/pix-art/preferences.html:64 +#: searx/templates/simple/preferences.html:86 +msgid "Allow" +msgstr "Cho phép" + +#: searx/templates/courgette/preferences.html:102 +#: searx/templates/courgette/preferences.html:114 +#: searx/templates/legacy/preferences.html:99 +#: searx/templates/legacy/preferences.html:111 +#: searx/templates/pix-art/preferences.html:54 +#: searx/templates/pix-art/preferences.html:65 +msgid "Block" +msgstr "Chặn" + +#: searx/templates/courgette/preferences.html:122 +#: searx/templates/legacy/preferences.html:119 +#: searx/templates/oscar/preferences.html:297 +#: searx/templates/pix-art/preferences.html:73 +#: searx/templates/simple/preferences.html:180 +msgid "" +"These settings are stored in your cookies, this allows us not to store this " +"data about you." +msgstr "Những cài đặt này được lưu trữ trong các cookie, điều này cho phép chúng tôi không phải lưu các dữ liệu về bạn." + +#: searx/templates/courgette/preferences.html:124 +#: searx/templates/legacy/preferences.html:121 +#: searx/templates/oscar/preferences.html:299 +#: searx/templates/pix-art/preferences.html:75 +#: searx/templates/simple/preferences.html:182 +msgid "" +"These cookies serve your sole convenience, we don't use these cookies to " +"track you." +msgstr "Những cookie này chỉ phục vụ cho chính bạn, chúng tôi không sử dụng chúng để theo dõi bạn." + +#: searx/templates/courgette/preferences.html:127 +#: searx/templates/legacy/preferences.html:124 +#: searx/templates/oscar/preferences.html:305 +#: searx/templates/pix-art/preferences.html:78 +#: searx/templates/simple/preferences.html:185 +msgid "save" +msgstr "lưu" + +#: searx/templates/courgette/preferences.html:128 +#: searx/templates/legacy/preferences.html:125 +#: searx/templates/oscar/preferences.html:307 +#: searx/templates/simple/preferences.html:186 +msgid "Reset defaults" +msgstr "Đưa về mặc định" + +#: searx/templates/courgette/preferences.html:129 +#: searx/templates/legacy/preferences.html:126 +#: searx/templates/oscar/preferences.html:306 +#: searx/templates/pix-art/preferences.html:79 +#: searx/templates/simple/preferences.html:187 +msgid "back" +msgstr "trở về" + +#: searx/templates/courgette/results.html:12 +#: searx/templates/legacy/results.html:13 +#: searx/templates/oscar/results.html:136 +#: searx/templates/simple/results.html:58 +msgid "Search URL" +msgstr "URL Tìm kiếm" + +#: searx/templates/courgette/results.html:16 +#: searx/templates/legacy/results.html:17 +#: searx/templates/oscar/results.html:141 +#: searx/templates/simple/results.html:62 +msgid "Download results" +msgstr "Tải về các kết quả" + +#: searx/templates/courgette/results.html:34 +#: searx/templates/legacy/results.html:35 +#: searx/templates/simple/results.html:10 +msgid "Answers" +msgstr "Các đáp án" + +#: searx/templates/courgette/results.html:42 +#: searx/templates/legacy/results.html:43 +#: searx/templates/oscar/results.html:116 +#: searx/templates/simple/results.html:42 +msgid "Suggestions" +msgstr "Các gợi ý" + +#: searx/templates/courgette/results.html:70 +#: searx/templates/legacy/results.html:81 +#: searx/templates/oscar/results.html:68 searx/templates/oscar/results.html:78 +#: searx/templates/simple/results.html:130 +msgid "previous page" +msgstr "trang liền trước" + +#: searx/templates/courgette/results.html:81 +#: searx/templates/legacy/results.html:92 +#: searx/templates/oscar/results.html:62 searx/templates/oscar/results.html:84 +#: searx/templates/simple/results.html:145 +msgid "next page" +msgstr "trang tiếp theo" + +#: searx/templates/courgette/search.html:3 +#: searx/templates/legacy/search.html:3 searx/templates/oscar/search.html:6 +#: searx/templates/oscar/search_full.html:9 +#: searx/templates/pix-art/search.html:3 searx/templates/simple/search.html:4 +msgid "Search for..." +msgstr "Tìm kiếm về..." + +#: searx/templates/courgette/stats.html:4 searx/templates/legacy/stats.html:4 +#: searx/templates/oscar/stats.html:5 searx/templates/pix-art/stats.html:4 +#: searx/templates/simple/stats.html:7 +msgid "Engine stats" +msgstr "Các thông số về trình tìm kiếm" + +#: searx/templates/courgette/result_templates/images.html:4 +#: searx/templates/legacy/result_templates/images.html:4 +#: searx/templates/pix-art/result_templates/images.html:4 +msgid "original context" +msgstr "ngữ cảnh gốc" + +#: searx/templates/courgette/result_templates/torrent.html:7 +#: searx/templates/legacy/result_templates/torrent.html:11 +#: searx/templates/oscar/result_templates/torrent.html:6 +#: searx/templates/simple/result_templates/torrent.html:9 +msgid "Seeder" +msgstr "Seeder" + +#: searx/templates/courgette/result_templates/torrent.html:7 +#: searx/templates/legacy/result_templates/torrent.html:11 +#: searx/templates/oscar/result_templates/torrent.html:6 +#: searx/templates/simple/result_templates/torrent.html:9 +msgid "Leecher" +msgstr "Leecher" + +#: searx/templates/courgette/result_templates/torrent.html:9 +#: searx/templates/legacy/result_templates/torrent.html:9 +#: searx/templates/oscar/macros.html:23 +#: searx/templates/simple/result_templates/torrent.html:6 +msgid "magnet link" +msgstr "liên kết magnet" + +#: searx/templates/courgette/result_templates/torrent.html:10 +#: searx/templates/legacy/result_templates/torrent.html:10 +#: searx/templates/oscar/macros.html:24 +#: searx/templates/simple/result_templates/torrent.html:7 +msgid "torrent file" +msgstr "tập tin torrent" + +#: searx/templates/legacy/categories.html:8 +#: searx/templates/simple/categories.html:6 +msgid "Click on the magnifier to perform search" +msgstr "Nhấp vào hình kính lúp để tiến hành tìm kiếm" + +#: searx/templates/legacy/preferences.html:84 +#: searx/templates/oscar/preferences.html:113 +#: searx/templates/simple/preferences.html:142 +msgid "Results on new tabs" +msgstr "Hiện kết quả trên các thẻ mới" + +#: searx/templates/legacy/preferences.html:87 +#: searx/templates/oscar/preferences.html:117 +#: searx/templates/simple/preferences.html:145 +msgid "On" +msgstr "Bật" + +#: searx/templates/legacy/preferences.html:88 +#: searx/templates/oscar/preferences.html:118 +#: searx/templates/simple/preferences.html:146 +msgid "Off" +msgstr "Tắt" + +#: searx/templates/legacy/result_templates/code.html:3 +#: searx/templates/legacy/result_templates/default.html:3 +#: searx/templates/legacy/result_templates/map.html:9 +#: searx/templates/oscar/macros.html:34 searx/templates/oscar/macros.html:48 +#: searx/templates/simple/macros.html:43 +msgid "cached" +msgstr "đã lưu cache" + +#: searx/templates/oscar/advanced.html:4 +msgid "Advanced settings" +msgstr "Cài đặt nâng cao" + +#: searx/templates/oscar/base.html:62 +#: searx/templates/oscar/messages/first_time.html:4 +#: searx/templates/oscar/messages/save_settings_successfull.html:5 +#: searx/templates/oscar/messages/unknow_error.html:5 +msgid "Close" +msgstr "Đóng" + +#: searx/templates/oscar/base.html:64 +#: searx/templates/oscar/messages/no_results.html:4 +#: searx/templates/simple/messages/no_results.html:4 +#: searx/templates/simple/results.html:25 +msgid "Error!" +msgstr "Lỗi!" + +#: searx/templates/oscar/base.html:90 searx/templates/simple/base.html:55 +msgid "Powered by" +msgstr "Được cung cấp bởi" + +#: searx/templates/oscar/base.html:90 searx/templates/simple/base.html:55 +msgid "a privacy-respecting, hackable metasearch engine" +msgstr "một trình tìm kiếm đa nguồn, dễ tuỳ biến và tôn trọng quyền riêng tư" + +#: searx/templates/oscar/macros.html:36 searx/templates/oscar/macros.html:50 +#: searx/templates/simple/macros.html:43 +msgid "proxied" +msgstr "đã proxy" + +#: searx/templates/oscar/macros.html:92 +msgid "supported" +msgstr "có hỗ trợ" + +#: searx/templates/oscar/macros.html:96 +msgid "not supported" +msgstr "không hỗ trợ" + +#: searx/templates/oscar/preferences.html:13 +#: searx/templates/oscar/preferences.html:22 +#: searx/templates/simple/preferences.html:32 +msgid "General" +msgstr "Tổng quát" + +#: searx/templates/oscar/preferences.html:14 +#: searx/templates/oscar/preferences.html:146 +#: searx/templates/simple/preferences.html:76 +msgid "Engines" +msgstr "Các trình tìm kiếm" + +#: searx/templates/oscar/preferences.html:15 +#: searx/templates/oscar/preferences.html:219 +msgid "Plugins" +msgstr "Các phần mở rộng" + +#: searx/templates/oscar/preferences.html:16 +#: searx/templates/oscar/preferences.html:245 +msgid "Answerers" +msgstr "Trình trả lời nhanh" + +#: searx/templates/oscar/preferences.html:17 +#: searx/templates/oscar/preferences.html:272 +msgid "Cookies" +msgstr "Các cookie" + +#: searx/templates/oscar/preferences.html:42 +#: searx/templates/simple/preferences.html:48 +msgid "What language do you prefer for search?" +msgstr "Bạn muốn tìm kiếm bằng ngôn ngữ nào?" + +#: searx/templates/oscar/preferences.html:48 +#: searx/templates/simple/preferences.html:128 +msgid "Change the language of the layout" +msgstr "Thay đổi ngôn ngữ giao diện" + +#: searx/templates/oscar/preferences.html:58 +#: searx/templates/simple/preferences.html:60 +msgid "Find stuff as you type" +msgstr "Tìm kiếm ngay khi gõ" + +#: searx/templates/oscar/preferences.html:69 +#: searx/templates/simple/preferences.html:173 +msgid "Proxying image results through searx" +msgstr "Proxy kết quả hình ảnh qua searx" + +#: searx/templates/oscar/preferences.html:78 +msgid "" +"Change how forms are submited, <a " +"href=\"http://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods\"" +" rel=\"external\">learn more about request methods</a>" +msgstr "Thay đổi cách thức các cụm từ tìm kiếm được gửi đi, <a href=\"http://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods\" rel=\"external\">tìm hiểu thêm về các phương thức tìm kiếm</a>" + +#: searx/templates/oscar/preferences.html:87 +#: searx/templates/simple/preferences.html:71 +msgid "Filter content" +msgstr "Lọc các nội dung" + +#: searx/templates/oscar/preferences.html:97 +#: searx/templates/simple/preferences.html:139 +msgid "Change searx layout" +msgstr "Thay đổi giao diện searx" + +#: searx/templates/oscar/preferences.html:106 +#: searx/templates/oscar/preferences.html:111 +msgid "Choose style for this theme" +msgstr "Chọn phong cách cho nền này" + +#: searx/templates/oscar/preferences.html:106 +#: searx/templates/oscar/preferences.html:111 +msgid "Style" +msgstr "Phong cách" + +#: searx/templates/oscar/preferences.html:122 +msgid "Open Access DOI resolver" +msgstr "Trình xử lý DOI Truy Cập Miễn Phí" + +#: searx/templates/oscar/preferences.html:123 +msgid "" +"Redirect to open-access versions of publications when available (plugin " +"required)" +msgstr "Chuyển hướng đến các phiên bản truy cập miễn phí của ấn phẩm khi có thể (yêu cầu phần mở rộng)" + +#: searx/templates/oscar/preferences.html:163 +#: searx/templates/oscar/preferences.html:175 +#: searx/templates/simple/preferences.html:88 +msgid "Shortcut" +msgstr "Lối tắt" + +#: searx/templates/oscar/preferences.html:164 +#: searx/templates/oscar/preferences.html:174 +msgid "Selected language" +msgstr "Ngôn ngữ được chọn" + +#: searx/templates/oscar/preferences.html:166 +#: searx/templates/oscar/preferences.html:172 +#: searx/templates/simple/preferences.html:91 +msgid "Time range" +msgstr "Khoảng thời gian" + +#: searx/templates/oscar/preferences.html:167 +#: searx/templates/oscar/preferences.html:171 +#: searx/templates/simple/preferences.html:92 +msgid "Avg. time" +msgstr "Thời gian trung bình" + +#: searx/templates/oscar/preferences.html:168 +#: searx/templates/oscar/preferences.html:170 +#: searx/templates/simple/preferences.html:93 +msgid "Max time" +msgstr "Thời gian tối đa" + +#: searx/templates/oscar/preferences.html:248 +msgid "This is the list of searx's instant answering modules." +msgstr "Đây là danh sách các module trả lời nhanh của searx" + +#: searx/templates/oscar/preferences.html:252 +msgid "Name" +msgstr "Tên" + +#: searx/templates/oscar/preferences.html:253 +msgid "Keywords" +msgstr "Các từ khoá" + +#: searx/templates/oscar/preferences.html:254 +msgid "Description" +msgstr "Mô tả" + +#: searx/templates/oscar/preferences.html:255 +msgid "Examples" +msgstr "Các ví dụ" + +#: searx/templates/oscar/preferences.html:275 +msgid "" +"This is the list of cookies and their values searx is storing on your " +"computer." +msgstr "Đây là danh sách các cookie và giá trị của chúng mà searx đang lưu trữ trên máy tính của bạn." + +#: searx/templates/oscar/preferences.html:276 +msgid "With that list, you can assess searx transparency." +msgstr "Với danh sách này, bạn có thể đánh giá tính minh bạch của searx." + +#: searx/templates/oscar/preferences.html:281 +msgid "Cookie name" +msgstr "Tên cookie" + +#: searx/templates/oscar/preferences.html:282 +msgid "Value" +msgstr "Giá trị" + +#: searx/templates/oscar/preferences.html:301 +msgid "Search URL of the currently saved preferences" +msgstr "URL tìm kiếm của tuỳ chỉnh được lưu hiện tại" + +#: searx/templates/oscar/preferences.html:301 +msgid "" +"Note: specifying custom settings in the search URL can reduce privacy by " +"leaking data to the clicked result sites." +msgstr "Ghi chú: việc định rõ cài đặt cá nhân trong URL tìm kiếm có thể làm suy giảm mức độ riêng tư vì nó chuyển dữ liệu đến các trang kết quả được nhấp chọn." + +#: searx/templates/oscar/results.html:17 +msgid "Search results" +msgstr "Kết quả tìm kiếm" + +#: searx/templates/oscar/results.html:21 +#: searx/templates/simple/results.html:84 +msgid "Try searching for:" +msgstr "Thử tìm kiếm:" + +#: searx/templates/oscar/results.html:100 +#: searx/templates/simple/results.html:25 +msgid "Engines cannot retrieve results" +msgstr "Các trình tìm kiếm không nhận được kết quả" + +#: searx/templates/oscar/results.html:131 +msgid "Links" +msgstr "Các liên kết" + +#: searx/templates/oscar/search.html:8 +#: searx/templates/oscar/search_full.html:11 +#: searx/templates/simple/search.html:5 +msgid "Start search" +msgstr "Bắt đầu tìm kiếm" + +#: searx/templates/oscar/stats.html:2 +msgid "stats" +msgstr "các thông số" + +#: searx/templates/oscar/time-range.html:3 +#: searx/templates/simple/time-range.html:3 +msgid "Anytime" +msgstr "Bất kỳ lúc nào" + +#: searx/templates/oscar/time-range.html:6 +#: searx/templates/simple/time-range.html:6 +msgid "Last day" +msgstr "Hôm trước" + +#: searx/templates/oscar/time-range.html:9 +#: searx/templates/simple/time-range.html:9 +msgid "Last week" +msgstr "Tuần trước" + +#: searx/templates/oscar/time-range.html:12 +#: searx/templates/simple/time-range.html:12 +msgid "Last month" +msgstr "Tháng trước" + +#: searx/templates/oscar/time-range.html:15 +#: searx/templates/simple/time-range.html:15 +msgid "Last year" +msgstr "Năm ngoái" + +#: searx/templates/oscar/messages/first_time.html:6 +#: searx/templates/oscar/messages/no_data_available.html:3 +msgid "Heads up!" +msgstr "Cẩn thận!" + +#: searx/templates/oscar/messages/first_time.html:7 +msgid "It look like you are using searx first time." +msgstr "Có vẻ như bạn mới sử dụng searx lần đầu." + +#: searx/templates/oscar/messages/no_cookies.html:3 +msgid "Information!" +msgstr "Thông tin!" + +#: searx/templates/oscar/messages/no_cookies.html:4 +msgid "currently, there are no cookies defined." +msgstr "hiện tại không có cookie nào." + +#: searx/templates/oscar/messages/no_data_available.html:4 +msgid "There is currently no data available. " +msgstr "Hiện không có dữ liệu nào." + +#: searx/templates/oscar/messages/no_results.html:4 +#: searx/templates/simple/messages/no_results.html:4 +msgid "Engines cannot retrieve results." +msgstr "Các trình tìm kiếm không nhận được kết quả." + +#: searx/templates/oscar/messages/no_results.html:10 +#: searx/templates/simple/messages/no_results.html:10 +msgid "Please, try again later or find another searx instance." +msgstr "Xin thử lại lần nữa hoặc tìm một server searx khác" + +#: searx/templates/oscar/messages/no_results.html:14 +#: searx/templates/simple/messages/no_results.html:14 +msgid "Sorry!" +msgstr "Xin lỗi!" + +#: searx/templates/oscar/messages/no_results.html:15 +#: searx/templates/simple/messages/no_results.html:15 +msgid "" +"we didn't find any results. Please use another query or search in more " +"categories." +msgstr "chúng tôi không tìm thấy kết quả nào. Xin gõ cụm từ khác hoặc tìm kiếm trong nhiều danh mục hơn." + +#: searx/templates/oscar/messages/save_settings_successfull.html:7 +msgid "Well done!" +msgstr "Tốt lắm!" + +#: searx/templates/oscar/messages/save_settings_successfull.html:8 +msgid "Settings saved successfully." +msgstr "Lưu cài đặt thành công." + +#: searx/templates/oscar/messages/unknow_error.html:7 +msgid "Oh snap!" +msgstr "Quái quỷ thật!" + +#: searx/templates/oscar/messages/unknow_error.html:8 +msgid "Something went wrong." +msgstr "Đã có sự cố." + +#: searx/templates/oscar/result_templates/default.html:7 +#: searx/templates/simple/result_templates/default.html:6 +msgid "show media" +msgstr "hiện nội dung" + +#: searx/templates/oscar/result_templates/default.html:7 +#: searx/templates/simple/result_templates/default.html:6 +msgid "hide media" +msgstr "ẩn nội dung" + +#: searx/templates/oscar/result_templates/images.html:30 +msgid "Get image" +msgstr "Xem hình ảnh" + +#: searx/templates/oscar/result_templates/images.html:33 +msgid "View source" +msgstr "Xem nguồn" + +#: searx/templates/oscar/result_templates/map.html:7 +#: searx/templates/simple/result_templates/map.html:7 +msgid "show map" +msgstr "hiện bản đồ" + +#: searx/templates/oscar/result_templates/map.html:7 +#: searx/templates/simple/result_templates/map.html:7 +msgid "hide map" +msgstr "ẩn bản đồ" + +#: searx/templates/oscar/result_templates/map.html:11 +#: searx/templates/simple/result_templates/map.html:11 +msgid "show details" +msgstr "hiện chi tiết" + +#: searx/templates/oscar/result_templates/map.html:11 +#: searx/templates/simple/result_templates/map.html:11 +msgid "hide details" +msgstr "ẩn chi tiết" + +#: searx/templates/oscar/result_templates/torrent.html:7 +#: searx/templates/simple/result_templates/torrent.html:11 +msgid "Filesize" +msgstr "Kích thước tập tin" + +#: searx/templates/oscar/result_templates/torrent.html:9 +#: searx/templates/simple/result_templates/torrent.html:12 +msgid "Bytes" +msgstr "Byte" + +#: searx/templates/oscar/result_templates/torrent.html:10 +#: searx/templates/simple/result_templates/torrent.html:13 +msgid "kiB" +msgstr "kiB" + +#: searx/templates/oscar/result_templates/torrent.html:11 +#: searx/templates/simple/result_templates/torrent.html:14 +msgid "MiB" +msgstr "MiB" + +#: searx/templates/oscar/result_templates/torrent.html:12 +#: searx/templates/simple/result_templates/torrent.html:15 +msgid "GiB" +msgstr "GiB" + +#: searx/templates/oscar/result_templates/torrent.html:13 +#: searx/templates/simple/result_templates/torrent.html:16 +msgid "TiB" +msgstr "TiB" + +#: searx/templates/oscar/result_templates/torrent.html:15 +#: searx/templates/simple/result_templates/torrent.html:20 +msgid "Number of Files" +msgstr "Số lượng tập tin" + +#: searx/templates/oscar/result_templates/videos.html:7 +#: searx/templates/simple/result_templates/videos.html:6 +msgid "show video" +msgstr "hiện " + +#: searx/templates/oscar/result_templates/videos.html:7 +#: searx/templates/simple/result_templates/videos.html:6 +msgid "hide video" +msgstr "ẩn phim" + +#: searx/templates/pix-art/results.html:28 +msgid "Load more..." +msgstr "Tải thêm..." + +#: searx/templates/simple/base.html:31 +msgid "No item found" +msgstr "Không tìm thấy gì" + +#: searx/templates/simple/preferences.html:89 +msgid "Supports selected language" +msgstr "Có hỗ trợ ngôn ngữ được chọn" + +#: searx/templates/simple/preferences.html:118 +msgid "User interface" +msgstr "Giao diện người dùng" + +#: searx/templates/simple/preferences.html:154 +msgid "Privacy" +msgstr "Quyền riêng tư" diff --git a/searx/translations/zh_CN/LC_MESSAGES/messages.mo b/searx/translations/zh_CN/LC_MESSAGES/messages.mo index b094298fdb..c2006aca13 100644 Binary files a/searx/translations/zh_CN/LC_MESSAGES/messages.mo and b/searx/translations/zh_CN/LC_MESSAGES/messages.mo differ diff --git a/searx/translations/zh_CN/LC_MESSAGES/messages.po b/searx/translations/zh_CN/LC_MESSAGES/messages.po index f7a7068eb6..78acb2d40b 100644 --- a/searx/translations/zh_CN/LC_MESSAGES/messages.po +++ b/searx/translations/zh_CN/LC_MESSAGES/messages.po @@ -3,15 +3,18 @@ # This file is distributed under the same license as the PROJECT project. # # Translators: +# Crystal RainSlide, 2018 +# Mingye Wang <arthur200126@gmail.com>, 2018 +# Sion Kazama, 2018 # wenke, 2015 -# wenke, 2015-2017 +# wenke, 2015-2018 msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" "POT-Creation-Date: 2017-11-01 21:31+0100\n" -"PO-Revision-Date: 2017-11-01 20:31+0000\n" -"Last-Translator: Adam Tauber <asciimoo@gmail.com>\n" +"PO-Revision-Date: 2018-12-10 08:32+0000\n" +"Last-Translator: Crystal RainSlide\n" "Language-Team: Chinese (China) (http://www.transifex.com/asciimoo/searx/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -58,7 +61,7 @@ msgstr "视频" #: searx/webapp.py:142 msgid "it" -msgstr "it" +msgstr "IT" #: searx/webapp.py:143 msgid "news" @@ -74,7 +77,7 @@ msgstr "学术" #: searx/webapp.py:399 searx/webapp.py:658 msgid "Invalid settings, please edit your preferences" -msgstr "无效的设置，请编辑你的首选项" +msgstr "设置无效，请编辑您的首选项" #: searx/webapp.py:415 msgid "Invalid settings" @@ -86,11 +89,11 @@ msgstr "搜索错误" #: searx/webapp.py:530 msgid "{minutes} minute(s) ago" -msgstr "{minutes}分钟之前" +msgstr "{minutes} 分钟前" #: searx/webapp.py:532 msgid "{hours} hour(s), {minutes} minute(s) ago" -msgstr "{hours}小时{minutes}分钟之前" +msgstr "{hours} 小时 {minutes} 分钟前" #: searx/answerers/random/answerer.py:53 msgid "Random value generator" @@ -106,7 +109,7 @@ msgstr "统计功能" #: searx/answerers/statistics/answerer.py:54 msgid "Compute {functions} of the arguments" -msgstr "计算 {functions}参数" +msgstr "计算 {functions} 参数" #: searx/engines/__init__.py:194 searx/engines/flycheck___init__.py:201 msgid "Engine time (sec)" @@ -114,7 +117,7 @@ msgstr "搜索引擎时间（秒）" #: searx/engines/__init__.py:198 searx/engines/flycheck___init__.py:205 msgid "Page loads (sec)" -msgstr "页面加载（秒）" +msgstr "页面加载（秒）" #: searx/engines/__init__.py:202 searx/engines/flycheck___init__.py:209 #: searx/templates/oscar/results.html:95 @@ -128,7 +131,7 @@ msgstr "得分" #: searx/engines/__init__.py:210 searx/engines/flycheck___init__.py:217 msgid "Scores per result" -msgstr "每个结果等分" +msgstr "每个结果的分数" #: searx/engines/__init__.py:214 searx/engines/flycheck___init__.py:221 msgid "Errors" @@ -136,19 +139,19 @@ msgstr "错误" #: searx/engines/pdbe.py:87 msgid "{title} (OBSOLETE)" -msgstr "{title} (OBSOLETE)" +msgstr "{title} (过时)" #: searx/engines/pdbe.py:91 msgid "This entry has been superseded by" -msgstr "此条目已经被取代" +msgstr "此条目已被取代" #: searx/engines/pubmed.py:74 msgid "No abstract is available for this publication." -msgstr "" +msgstr "本出版物没有摘要。" #: searx/plugins/https_rewrite.py:32 msgid "Rewrite HTTP links to HTTPS if possible" -msgstr "尽可能重定向HTTP链接到HTTPS" +msgstr "将支持 HTTPS 的 HTTP 链接改为 HTTPS 链接" #: searx/plugins/infinite_scroll.py:3 msgid "Infinite scroll" @@ -160,13 +163,13 @@ msgstr "滚动到当前页面底部时自动加载下一页" #: searx/plugins/oa_doi_rewrite.py:9 msgid "Open Access DOI rewrite" -msgstr "" +msgstr "开放访问 DOI 重定向" #: searx/plugins/oa_doi_rewrite.py:10 msgid "" "Avoid paywalls by redirecting to open-access versions of publications when " "available" -msgstr "重定向到可浏览的文章来避免付费墙（如果可用）" +msgstr "尽量重定向到开放访问的文章以避免付费墙（如果可用）" #: searx/plugins/open_results_on_new_tab.py:18 #: searx/templates/oscar/preferences.html:114 @@ -178,7 +181,7 @@ msgstr "在新标签页打开搜索链接" msgid "" "Results are opened in the same window by default. This plugin overwrites the" " default behaviour to open links on new tabs/windows. (JavaScript required)" -msgstr "搜索结果默认在原窗口打开。这个插件使其在新标签页/窗口打开。（需要启用JavaScript ）" +msgstr "搜索结果默认在原窗口打开。此插件能使其在新标签页或新窗口打开。（需启用 JavaScript）" #: searx/plugins/search_on_category_select.py:18 msgid "Search on category select" @@ -188,13 +191,13 @@ msgstr "搜索类别选择" msgid "" "Perform search immediately if a category selected. Disable to select " "multiple categories. (JavaScript required)" -msgstr "选中一个类别立即搜索。禁用可以选择多个类别搜索。（需要启用JavaScript ）" +msgstr "选中一个类别后立即执行搜索。禁用后，可以选择多个类别一起搜索。（需启用 JavaScript）" #: searx/plugins/self_info.py:20 msgid "" "Displays your IP if the query is \"ip\" and your user agent if the query " "contains \"user agent\"." -msgstr "搜索“ip”显示你的ip以及搜索内容含有“user agent”显示你的user agent。" +msgstr "当您搜索「ip」时，这将会显示您的 IP 地址；同理，在搜索「user agent」时，将会显示您的 User Agent。" #: searx/plugins/tracker_url_remover.py:26 msgid "Tracker URL remover" @@ -206,13 +209,13 @@ msgstr "从返回的链接中移除跟踪参数" #: searx/plugins/vim_hotkeys.py:3 msgid "Vim-like hotkeys" -msgstr "类vim快捷键" +msgstr "Vim 式快捷键" #: searx/plugins/vim_hotkeys.py:4 msgid "" "Navigate search results with Vim-like hotkeys (JavaScript required). Press " "\"h\" key on main or result page to get help." -msgstr "使用类vim快捷键浏览搜索结果（JavaScript启用）。按“h”键获取帮助。" +msgstr "使用 Vim 式快捷键浏览搜索结果（需要 JavaScript）。在主页或结果页按“h”键获取帮助。" #: searx/templates/courgette/404.html:4 searx/templates/legacy/404.html:4 #: searx/templates/oscar/404.html:4 searx/templates/pix-art/404.html:4 @@ -225,7 +228,7 @@ msgstr "未找到网页" #: searx/templates/simple/404.html:6 #, python-format msgid "Go to %(search_page)s." -msgstr "返回%(search_page)s。" +msgstr "前往 %(search_page)s。" #: searx/templates/courgette/404.html:6 searx/templates/legacy/404.html:6 #: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 @@ -342,7 +345,7 @@ msgstr "安全搜索" #: searx/templates/oscar/preferences.html:90 #: searx/templates/simple/preferences.html:66 msgid "Strict" -msgstr "严格模式" +msgstr "严格" #: searx/templates/courgette/preferences.html:67 #: searx/templates/legacy/preferences.html:68 @@ -356,7 +359,7 @@ msgstr "中等" #: searx/templates/oscar/preferences.html:92 #: searx/templates/simple/preferences.html:68 msgid "None" -msgstr "不过滤" +msgstr "无" #: searx/templates/courgette/preferences.html:73 #: searx/templates/legacy/preferences.html:74 @@ -444,7 +447,7 @@ msgstr "阻止" msgid "" "These settings are stored in your cookies, this allows us not to store this " "data about you." -msgstr "这些设置保存在你的cookie，我们将不能保存你的数据。" +msgstr "这些设置被存储在您的 cookie 中，这种保存设置的方式允许我们不存储您的设置数据。" #: searx/templates/courgette/preferences.html:124 #: searx/templates/legacy/preferences.html:121 @@ -454,7 +457,7 @@ msgstr "这些设置保存在你的cookie，我们将不能保存你的数据。 msgid "" "These cookies serve your sole convenience, we don't use these cookies to " "track you." -msgstr "这些cookie是为了让你更加方便，我们不会使用cookie追踪你。" +msgstr "这些 Cookie 信息可辅助您便捷地使用服务，我们不会利用这些信息来追踪您。" #: searx/templates/courgette/preferences.html:127 #: searx/templates/legacy/preferences.html:124 @@ -544,14 +547,14 @@ msgstr "原始上下文" #: searx/templates/oscar/result_templates/torrent.html:6 #: searx/templates/simple/result_templates/torrent.html:9 msgid "Seeder" -msgstr "Seeder" +msgstr "做种" #: searx/templates/courgette/result_templates/torrent.html:7 #: searx/templates/legacy/result_templates/torrent.html:11 #: searx/templates/oscar/result_templates/torrent.html:6 #: searx/templates/simple/result_templates/torrent.html:9 msgid "Leecher" -msgstr "Leecher" +msgstr "接收" #: searx/templates/courgette/result_templates/torrent.html:9 #: searx/templates/legacy/result_templates/torrent.html:9 @@ -570,7 +573,7 @@ msgstr "种子文件" #: searx/templates/legacy/categories.html:8 #: searx/templates/simple/categories.html:6 msgid "Click on the magnifier to perform search" -msgstr "点击放大镜开始搜索" +msgstr "点击放大镜按钮开始搜索" #: searx/templates/legacy/preferences.html:84 #: searx/templates/oscar/preferences.html:113 @@ -622,7 +625,7 @@ msgstr "技术支持来自" #: searx/templates/oscar/base.html:90 searx/templates/simple/base.html:55 msgid "a privacy-respecting, hackable metasearch engine" -msgstr "一个尊重隐私，可再开发的元搜索引擎" +msgstr "一个尊重隐私、可再开发的元搜索引擎" #: searx/templates/oscar/macros.html:36 searx/templates/oscar/macros.html:50 #: searx/templates/simple/macros.html:43 @@ -662,12 +665,12 @@ msgstr "智能答复" #: searx/templates/oscar/preferences.html:17 #: searx/templates/oscar/preferences.html:272 msgid "Cookies" -msgstr "Cookie" +msgstr "Cookies" #: searx/templates/oscar/preferences.html:42 #: searx/templates/simple/preferences.html:48 msgid "What language do you prefer for search?" -msgstr "你搜索时更喜欢什么语言？" +msgstr "您更喜欢使用什么语言进行搜索？" #: searx/templates/oscar/preferences.html:48 #: searx/templates/simple/preferences.html:128 @@ -682,14 +685,14 @@ msgstr "自动补全搜索字词" #: searx/templates/oscar/preferences.html:69 #: searx/templates/simple/preferences.html:173 msgid "Proxying image results through searx" -msgstr "通过searx代理图片" +msgstr "通过 searx 代理图片结果" #: searx/templates/oscar/preferences.html:78 msgid "" "Change how forms are submited, <a " "href=\"http://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods\"" " rel=\"external\">learn more about request methods</a>" -msgstr "更改请求方法，<a href=\"http://zh.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods\" rel=\"external\">深入了解请求方法</a>" +msgstr "更改提交表单时使用的请求方法，<a href=\"https://zh.wikipedia.org/wiki/%E8%B6%85%E6%96%87%E6%9C%AC%E4%BC%A0%E8%BE%93%E5%8D%8F%E8%AE%AE#%E8%AF%B7%E6%B1%82%E6%96%B9%E6%B3%95\" rel=\"external\">深入了解请求方法</a>" #: searx/templates/oscar/preferences.html:87 #: searx/templates/simple/preferences.html:71 @@ -699,12 +702,12 @@ msgstr "过滤内容" #: searx/templates/oscar/preferences.html:97 #: searx/templates/simple/preferences.html:139 msgid "Change searx layout" -msgstr "改变searx布局" +msgstr "改变 searx 布局" #: searx/templates/oscar/preferences.html:106 #: searx/templates/oscar/preferences.html:111 msgid "Choose style for this theme" -msgstr "选择这个主题的样式" +msgstr "选择此主题的样式" #: searx/templates/oscar/preferences.html:106 #: searx/templates/oscar/preferences.html:111 @@ -713,13 +716,13 @@ msgstr "样式" #: searx/templates/oscar/preferences.html:122 msgid "Open Access DOI resolver" -msgstr "" +msgstr "开放访问 DOI 解析器" #: searx/templates/oscar/preferences.html:123 msgid "" "Redirect to open-access versions of publications when available (plugin " "required)" -msgstr "" +msgstr "尽可能重定向到出版物的开放访问版本（需要插件）" #: searx/templates/oscar/preferences.html:163 #: searx/templates/oscar/preferences.html:175 @@ -752,7 +755,7 @@ msgstr "最大时间" #: searx/templates/oscar/preferences.html:248 msgid "This is the list of searx's instant answering modules." -msgstr "这是searx的即时回答模块。" +msgstr "这是 searx 的即时回答模块列表。" #: searx/templates/oscar/preferences.html:252 msgid "Name" @@ -768,21 +771,21 @@ msgstr "描述" #: searx/templates/oscar/preferences.html:255 msgid "Examples" -msgstr "例子" +msgstr "示例" #: searx/templates/oscar/preferences.html:275 msgid "" "This is the list of cookies and their values searx is storing on your " "computer." -msgstr "这里展示了searx保存在你的电脑上的cookie。" +msgstr "此列表展示了 searx 在您设备上存储的 cookie 信息。" #: searx/templates/oscar/preferences.html:276 msgid "With that list, you can assess searx transparency." -msgstr "有了这个列表，你可以评估searx透明度。" +msgstr "您可以基于此表格来评估 searx 的透明度。" #: searx/templates/oscar/preferences.html:281 msgid "Cookie name" -msgstr "cookie名称" +msgstr "Cookie 名称" #: searx/templates/oscar/preferences.html:282 msgid "Value" @@ -796,7 +799,7 @@ msgstr "当前保存选项的搜索链接" msgid "" "Note: specifying custom settings in the search URL can reduce privacy by " "leaking data to the clicked result sites." -msgstr "注意：在搜索链接中保存自定义设置会把数据泄露给点击的网站泄漏隐私。" +msgstr "注意：在搜索链接中保存自定义设置会把数据泄露给点击的结果网站，从而泄漏隐私。" #: searx/templates/oscar/results.html:17 msgid "Search results" @@ -810,7 +813,7 @@ msgstr "尝试搜索：" #: searx/templates/oscar/results.html:100 #: searx/templates/simple/results.html:25 msgid "Engines cannot retrieve results" -msgstr "引擎无法检索结果" +msgstr "引擎无法获取结果" #: searx/templates/oscar/results.html:131 msgid "Links" @@ -858,29 +861,29 @@ msgstr "小心！" #: searx/templates/oscar/messages/first_time.html:7 msgid "It look like you are using searx first time." -msgstr "看起来你是第一次使用searx。" +msgstr "看来这是您第一次使用 searx。" #: searx/templates/oscar/messages/no_cookies.html:3 msgid "Information!" -msgstr "信息！" +msgstr "注意！" #: searx/templates/oscar/messages/no_cookies.html:4 msgid "currently, there are no cookies defined." -msgstr "目前还未保存cookie。" +msgstr "目前，还没有任何信息被存储在 Cookie 中。" #: searx/templates/oscar/messages/no_data_available.html:4 msgid "There is currently no data available. " -msgstr "目前没有数据可用。" +msgstr "目前没有可用的数据。" #: searx/templates/oscar/messages/no_results.html:4 #: searx/templates/simple/messages/no_results.html:4 msgid "Engines cannot retrieve results." -msgstr "引擎无法检索结果。" +msgstr "引擎无法获取结果。" #: searx/templates/oscar/messages/no_results.html:10 #: searx/templates/simple/messages/no_results.html:10 msgid "Please, try again later or find another searx instance." -msgstr "请稍后再试或使用其他的searx实例。" +msgstr "请稍后再试，或寻找其它的 searx 实例替代。" #: searx/templates/oscar/messages/no_results.html:14 #: searx/templates/simple/messages/no_results.html:14 @@ -892,7 +895,7 @@ msgstr "抱歉！" msgid "" "we didn't find any results. Please use another query or search in more " "categories." -msgstr "我们没有找到任何结果。请换用其他词语或在更多类别中搜索。" +msgstr "我们没有找到任何结果。请使用其它关键词或在更多类别中搜索。" #: searx/templates/oscar/messages/save_settings_successfull.html:7 msgid "Well done!" @@ -961,22 +964,22 @@ msgstr "B" #: searx/templates/oscar/result_templates/torrent.html:10 #: searx/templates/simple/result_templates/torrent.html:13 msgid "kiB" -msgstr "KB" +msgstr "kiB" #: searx/templates/oscar/result_templates/torrent.html:11 #: searx/templates/simple/result_templates/torrent.html:14 msgid "MiB" -msgstr "MB" +msgstr "MiB" #: searx/templates/oscar/result_templates/torrent.html:12 #: searx/templates/simple/result_templates/torrent.html:15 msgid "GiB" -msgstr "GB" +msgstr "GiB" #: searx/templates/oscar/result_templates/torrent.html:13 #: searx/templates/simple/result_templates/torrent.html:16 msgid "TiB" -msgstr "TB" +msgstr "TiB" #: searx/templates/oscar/result_templates/torrent.html:15 #: searx/templates/simple/result_templates/torrent.html:20 @@ -995,7 +998,7 @@ msgstr "隐藏视频" #: searx/templates/pix-art/results.html:28 msgid "Load more..." -msgstr "载入更多..." +msgstr "载入更多……" #: searx/templates/simple/base.html:31 msgid "No item found" @@ -1003,7 +1006,7 @@ msgstr "未找到条目" #: searx/templates/simple/preferences.html:89 msgid "Supports selected language" -msgstr "是否支持选定的语言" +msgstr "支持选定的语言" #: searx/templates/simple/preferences.html:118 msgid "User interface" diff --git a/searx/translations/zh_Hant_TW/LC_MESSAGES/messages.mo b/searx/translations/zh_Hant_TW/LC_MESSAGES/messages.mo index b7e099977f..0b2a3c921c 100644 Binary files a/searx/translations/zh_Hant_TW/LC_MESSAGES/messages.mo and b/searx/translations/zh_Hant_TW/LC_MESSAGES/messages.mo differ diff --git a/searx/translations/zh_TW/LC_MESSAGES/messages.mo b/searx/translations/zh_TW/LC_MESSAGES/messages.mo new file mode 100644 index 0000000000..b6d43e2a89 Binary files /dev/null and b/searx/translations/zh_TW/LC_MESSAGES/messages.mo differ diff --git a/searx/translations/zh_TW/LC_MESSAGES/messages.po b/searx/translations/zh_TW/LC_MESSAGES/messages.po new file mode 100644 index 0000000000..0a4796f97e --- /dev/null +++ b/searx/translations/zh_TW/LC_MESSAGES/messages.po @@ -0,0 +1,1015 @@ +# Translations template for PROJECT. +# Copyright (C) 2017 ORGANIZATION +# This file is distributed under the same license as the PROJECT project. +# +# Translators: +# FIRST AUTHOR <EMAIL@ADDRESS>, 2016 +# Jeff Huang <s8321414@gmail.com>, 2017 +# Mingye Wang <arthur200126@gmail.com>, 2018 +msgid "" +msgstr "" +"Project-Id-Version: searx\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2017-11-01 21:31+0100\n" +"PO-Revision-Date: 2018-09-16 00:29+0000\n" +"Last-Translator: Mingye Wang <arthur200126@gmail.com>\n" +"Language-Team: Chinese (Taiwan) (http://www.transifex.com/asciimoo/searx/language/zh_TW/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 2.3.4\n" +"Language: zh_TW\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: searx/search.py:137 searx/search.py:182 +msgid "timeout" +msgstr "逾時" + +#: searx/search.py:144 +msgid "request exception" +msgstr "請求例外" + +#: searx/search.py:151 +msgid "unexpected crash" +msgstr "未預期的當機" + +#: searx/webapp.py:136 +msgid "files" +msgstr "檔案" + +#: searx/webapp.py:137 +msgid "general" +msgstr "一般" + +#: searx/webapp.py:138 +msgid "music" +msgstr "音樂" + +#: searx/webapp.py:139 +msgid "social media" +msgstr "社群媒體" + +#: searx/webapp.py:140 +msgid "images" +msgstr "圖片" + +#: searx/webapp.py:141 +msgid "videos" +msgstr "影片" + +#: searx/webapp.py:142 +msgid "it" +msgstr "IT" + +#: searx/webapp.py:143 +msgid "news" +msgstr "新聞" + +#: searx/webapp.py:144 +msgid "map" +msgstr "地圖" + +#: searx/webapp.py:145 +msgid "science" +msgstr "科學" + +#: searx/webapp.py:399 searx/webapp.py:658 +msgid "Invalid settings, please edit your preferences" +msgstr "無效的設定，請編輯您的偏好設定" + +#: searx/webapp.py:415 +msgid "Invalid settings" +msgstr "無效的設定" + +#: searx/webapp.py:449 searx/webapp.py:493 +msgid "search error" +msgstr "搜尋錯誤" + +#: searx/webapp.py:530 +msgid "{minutes} minute(s) ago" +msgstr "{minutes} 分鐘前" + +#: searx/webapp.py:532 +msgid "{hours} hour(s), {minutes} minute(s) ago" +msgstr "{hours} 小時 {minutes} 分鐘前" + +#: searx/answerers/random/answerer.py:53 +msgid "Random value generator" +msgstr "隨機數值產生器" + +#: searx/answerers/random/answerer.py:54 +msgid "Generate different random values" +msgstr "生成不同的隨機數值" + +#: searx/answerers/statistics/answerer.py:53 +msgid "Statistics functions" +msgstr "統計功能" + +#: searx/answerers/statistics/answerer.py:54 +msgid "Compute {functions} of the arguments" +msgstr "計算 {functions} 參數" + +#: searx/engines/__init__.py:194 searx/engines/flycheck___init__.py:201 +msgid "Engine time (sec)" +msgstr "引擎時間（秒）" + +#: searx/engines/__init__.py:198 searx/engines/flycheck___init__.py:205 +msgid "Page loads (sec)" +msgstr "頁面載入（秒）" + +#: searx/engines/__init__.py:202 searx/engines/flycheck___init__.py:209 +#: searx/templates/oscar/results.html:95 +#: searx/templates/simple/results.html:20 +msgid "Number of results" +msgstr "結果筆數" + +#: searx/engines/__init__.py:206 searx/engines/flycheck___init__.py:213 +msgid "Scores" +msgstr "分數" + +#: searx/engines/__init__.py:210 searx/engines/flycheck___init__.py:217 +msgid "Scores per result" +msgstr "每個結果的分數" + +#: searx/engines/__init__.py:214 searx/engines/flycheck___init__.py:221 +msgid "Errors" +msgstr "錯誤" + +#: searx/engines/pdbe.py:87 +msgid "{title} (OBSOLETE)" +msgstr "{title} (已過時)" + +#: searx/engines/pdbe.py:91 +msgid "This entry has been superseded by" +msgstr "此條目已被取代" + +#: searx/engines/pubmed.py:74 +msgid "No abstract is available for this publication." +msgstr "此出版品無可用摘要。" + +#: searx/plugins/https_rewrite.py:32 +msgid "Rewrite HTTP links to HTTPS if possible" +msgstr "可以的話將 HTTP 連結重寫為 HTTPS" + +#: searx/plugins/infinite_scroll.py:3 +msgid "Infinite scroll" +msgstr "無限捲動" + +#: searx/plugins/infinite_scroll.py:4 +msgid "Automatically load next page when scrolling to bottom of current page" +msgstr "當捲動至目前頁面的底部時自動載入下一頁" + +#: searx/plugins/oa_doi_rewrite.py:9 +msgid "Open Access DOI rewrite" +msgstr "開放存取 DOI 重寫" + +#: searx/plugins/oa_doi_rewrite.py:10 +msgid "" +"Avoid paywalls by redirecting to open-access versions of publications when " +"available" +msgstr "盡可能重新導向至出版品的開放存取版本，來避免付費牆" + +#: searx/plugins/open_results_on_new_tab.py:18 +#: searx/templates/oscar/preferences.html:114 +#: searx/templates/simple/preferences.html:149 +msgid "Open result links on new browser tabs" +msgstr "在新瀏覽器分頁中開啟結果連結" + +#: searx/plugins/open_results_on_new_tab.py:19 +msgid "" +"Results are opened in the same window by default. This plugin overwrites the" +" default behaviour to open links on new tabs/windows. (JavaScript required)" +msgstr "結果預設會在同一個視窗開啟。這個外掛程式會覆寫預設行為，會在新分頁／視窗中開啟連結。（需要 JavaScript）" + +#: searx/plugins/search_on_category_select.py:18 +msgid "Search on category select" +msgstr "類別選取搜尋" + +#: searx/plugins/search_on_category_select.py:19 +msgid "" +"Perform search immediately if a category selected. Disable to select " +"multiple categories. (JavaScript required)" +msgstr "若分類被選取時立刻執行搜尋。停用以選取多個分類。（需要 JavaScript）" + +#: searx/plugins/self_info.py:20 +msgid "" +"Displays your IP if the query is \"ip\" and your user agent if the query " +"contains \"user agent\"." +msgstr "若搜尋字串爲「ip」則顯示您的 IP，而若是「user agent」則顯示您的使用者代理字串。" + +#: searx/plugins/tracker_url_remover.py:26 +msgid "Tracker URL remover" +msgstr "追蹤器 URL 移除器" + +#: searx/plugins/tracker_url_remover.py:27 +msgid "Remove trackers arguments from the returned URL" +msgstr "從傳回的 URL 中移除追蹤器參數" + +#: searx/plugins/vim_hotkeys.py:3 +msgid "Vim-like hotkeys" +msgstr "類 Vim 快捷鍵" + +#: searx/plugins/vim_hotkeys.py:4 +msgid "" +"Navigate search results with Vim-like hotkeys (JavaScript required). Press " +"\"h\" key on main or result page to get help." +msgstr "以類 Vim 的快捷鍵導覽搜尋結果（需要 JavaScript）。在主頁面或結果頁面按「h」鍵以取得說明。" + +#: searx/templates/courgette/404.html:4 searx/templates/legacy/404.html:4 +#: searx/templates/oscar/404.html:4 searx/templates/pix-art/404.html:4 +#: searx/templates/simple/404.html:4 +msgid "Page not found" +msgstr "找不到頁面" + +#: searx/templates/courgette/404.html:6 searx/templates/legacy/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +#: searx/templates/simple/404.html:6 +#, python-format +msgid "Go to %(search_page)s." +msgstr "到 %(search_page)s。" + +#: searx/templates/courgette/404.html:6 searx/templates/legacy/404.html:6 +#: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6 +#: searx/templates/simple/404.html:6 +msgid "search page" +msgstr "搜尋頁面" + +#: searx/templates/courgette/index.html:9 +#: searx/templates/courgette/index.html:13 +#: searx/templates/courgette/results.html:5 +#: searx/templates/legacy/index.html:8 searx/templates/legacy/index.html:12 +#: searx/templates/oscar/navbar.html:7 +#: searx/templates/oscar/preferences.html:3 +#: searx/templates/pix-art/index.html:8 +msgid "preferences" +msgstr "偏好設定" + +#: searx/templates/courgette/index.html:11 +#: searx/templates/legacy/index.html:10 searx/templates/oscar/about.html:2 +#: searx/templates/oscar/navbar.html:6 searx/templates/pix-art/index.html:7 +msgid "about" +msgstr "關於" + +#: searx/templates/courgette/preferences.html:5 +#: searx/templates/legacy/preferences.html:5 +#: searx/templates/oscar/preferences.html:8 +#: searx/templates/pix-art/preferences.html:5 +#: searx/templates/simple/preferences.html:26 +msgid "Preferences" +msgstr "偏好設定" + +#: searx/templates/courgette/preferences.html:9 +#: searx/templates/legacy/preferences.html:9 +#: searx/templates/oscar/preferences.html:33 +#: searx/templates/oscar/preferences.html:35 +#: searx/templates/simple/preferences.html:34 +msgid "Default categories" +msgstr "預設分類" + +#: searx/templates/courgette/preferences.html:13 +#: searx/templates/legacy/preferences.html:14 +#: searx/templates/oscar/preferences.html:41 +#: searx/templates/pix-art/preferences.html:9 +#: searx/templates/simple/preferences.html:39 +#: searx/templates/simple/preferences.html:163 +msgid "Search language" +msgstr "搜尋語言" + +#: searx/templates/courgette/preferences.html:16 +#: searx/templates/legacy/preferences.html:17 +#: searx/templates/oscar/languages.html:6 +#: searx/templates/pix-art/preferences.html:12 +#: searx/templates/simple/languages.html:2 +#: searx/templates/simple/preferences.html:42 +msgid "Default language" +msgstr "預設語言" + +#: searx/templates/courgette/preferences.html:24 +#: searx/templates/legacy/preferences.html:25 +#: searx/templates/oscar/preferences.html:47 +#: searx/templates/pix-art/preferences.html:20 +#: searx/templates/simple/preferences.html:120 +msgid "Interface language" +msgstr "介面語言" + +#: searx/templates/courgette/preferences.html:34 +#: searx/templates/legacy/preferences.html:35 +#: searx/templates/oscar/preferences.html:57 +#: searx/templates/simple/preferences.html:51 +msgid "Autocomplete" +msgstr "自動完成" + +#: searx/templates/courgette/preferences.html:45 +#: searx/templates/legacy/preferences.html:46 +#: searx/templates/oscar/preferences.html:68 +#: searx/templates/simple/preferences.html:166 +msgid "Image proxy" +msgstr "圖片代理伺服器" + +#: searx/templates/courgette/preferences.html:48 +#: searx/templates/legacy/preferences.html:49 +#: searx/templates/oscar/preferences.html:72 +#: searx/templates/simple/preferences.html:169 +msgid "Enabled" +msgstr "已啟用" + +#: searx/templates/courgette/preferences.html:49 +#: searx/templates/legacy/preferences.html:50 +#: searx/templates/oscar/preferences.html:73 +#: searx/templates/simple/preferences.html:170 +msgid "Disabled" +msgstr "已停用" + +#: searx/templates/courgette/preferences.html:54 +#: searx/templates/legacy/preferences.html:55 +#: searx/templates/oscar/preferences.html:77 +#: searx/templates/pix-art/preferences.html:30 +#: searx/templates/simple/preferences.html:156 +msgid "Method" +msgstr "方法" + +#: searx/templates/courgette/preferences.html:63 +#: searx/templates/legacy/preferences.html:64 +#: searx/templates/oscar/preferences.html:86 +#: searx/templates/oscar/preferences.html:165 +#: searx/templates/oscar/preferences.html:173 +#: searx/templates/simple/preferences.html:63 +#: searx/templates/simple/preferences.html:90 +msgid "SafeSearch" +msgstr "安全搜尋" + +#: searx/templates/courgette/preferences.html:66 +#: searx/templates/legacy/preferences.html:67 +#: searx/templates/oscar/preferences.html:90 +#: searx/templates/simple/preferences.html:66 +msgid "Strict" +msgstr "嚴格" + +#: searx/templates/courgette/preferences.html:67 +#: searx/templates/legacy/preferences.html:68 +#: searx/templates/oscar/preferences.html:91 +#: searx/templates/simple/preferences.html:67 +msgid "Moderate" +msgstr "適中" + +#: searx/templates/courgette/preferences.html:68 +#: searx/templates/legacy/preferences.html:69 +#: searx/templates/oscar/preferences.html:92 +#: searx/templates/simple/preferences.html:68 +msgid "None" +msgstr "無" + +#: searx/templates/courgette/preferences.html:73 +#: searx/templates/legacy/preferences.html:74 +#: searx/templates/oscar/preferences.html:96 +#: searx/templates/pix-art/preferences.html:39 +#: searx/templates/simple/preferences.html:131 +msgid "Themes" +msgstr "佈景主題" + +#: searx/templates/courgette/preferences.html:83 +msgid "Color" +msgstr "顏色" + +#: searx/templates/courgette/preferences.html:86 +msgid "Blue (default)" +msgstr "藍色（預設值）" + +#: searx/templates/courgette/preferences.html:87 +msgid "Violet" +msgstr "紫色" + +#: searx/templates/courgette/preferences.html:88 +msgid "Green" +msgstr "綠色" + +#: searx/templates/courgette/preferences.html:89 +msgid "Cyan" +msgstr "青色" + +#: searx/templates/courgette/preferences.html:90 +msgid "Orange" +msgstr "橘色" + +#: searx/templates/courgette/preferences.html:91 +msgid "Red" +msgstr "紅色" + +#: searx/templates/courgette/preferences.html:96 +#: searx/templates/legacy/preferences.html:93 +#: searx/templates/pix-art/preferences.html:49 +#: searx/templates/simple/preferences.html:77 +msgid "Currently used search engines" +msgstr "目前使用的搜尋引擎" + +#: searx/templates/courgette/preferences.html:100 +#: searx/templates/legacy/preferences.html:97 +#: searx/templates/oscar/preferences.html:162 +#: searx/templates/oscar/preferences.html:176 +#: searx/templates/pix-art/preferences.html:53 +#: searx/templates/simple/preferences.html:87 +msgid "Engine name" +msgstr "引擎名稱" + +#: searx/templates/courgette/preferences.html:101 +#: searx/templates/legacy/preferences.html:98 +msgid "Category" +msgstr "分類" + +#: searx/templates/courgette/preferences.html:102 +#: searx/templates/courgette/preferences.html:113 +#: searx/templates/legacy/preferences.html:99 +#: searx/templates/legacy/preferences.html:110 +#: searx/templates/oscar/preferences.html:161 +#: searx/templates/oscar/preferences.html:177 +#: searx/templates/pix-art/preferences.html:54 +#: searx/templates/pix-art/preferences.html:64 +#: searx/templates/simple/preferences.html:86 +msgid "Allow" +msgstr "允許" + +#: searx/templates/courgette/preferences.html:102 +#: searx/templates/courgette/preferences.html:114 +#: searx/templates/legacy/preferences.html:99 +#: searx/templates/legacy/preferences.html:111 +#: searx/templates/pix-art/preferences.html:54 +#: searx/templates/pix-art/preferences.html:65 +msgid "Block" +msgstr "封鎖" + +#: searx/templates/courgette/preferences.html:122 +#: searx/templates/legacy/preferences.html:119 +#: searx/templates/oscar/preferences.html:297 +#: searx/templates/pix-art/preferences.html:73 +#: searx/templates/simple/preferences.html:180 +msgid "" +"These settings are stored in your cookies, this allows us not to store this " +"data about you." +msgstr "這些設定只會儲存在您的 cookies 中，這樣我們無需也不會存儲關於您的資訊。" + +#: searx/templates/courgette/preferences.html:124 +#: searx/templates/legacy/preferences.html:121 +#: searx/templates/oscar/preferences.html:299 +#: searx/templates/pix-art/preferences.html:75 +#: searx/templates/simple/preferences.html:182 +msgid "" +"These cookies serve your sole convenience, we don't use these cookies to " +"track you." +msgstr "這些 cookies 僅做為提供您方便之用，我們不會使用這些 cookies 來追蹤您。" + +#: searx/templates/courgette/preferences.html:127 +#: searx/templates/legacy/preferences.html:124 +#: searx/templates/oscar/preferences.html:305 +#: searx/templates/pix-art/preferences.html:78 +#: searx/templates/simple/preferences.html:185 +msgid "save" +msgstr "儲存" + +#: searx/templates/courgette/preferences.html:128 +#: searx/templates/legacy/preferences.html:125 +#: searx/templates/oscar/preferences.html:307 +#: searx/templates/simple/preferences.html:186 +msgid "Reset defaults" +msgstr "重設為預設值" + +#: searx/templates/courgette/preferences.html:129 +#: searx/templates/legacy/preferences.html:126 +#: searx/templates/oscar/preferences.html:306 +#: searx/templates/pix-art/preferences.html:79 +#: searx/templates/simple/preferences.html:187 +msgid "back" +msgstr "返回" + +#: searx/templates/courgette/results.html:12 +#: searx/templates/legacy/results.html:13 +#: searx/templates/oscar/results.html:136 +#: searx/templates/simple/results.html:58 +msgid "Search URL" +msgstr "搜尋網址" + +#: searx/templates/courgette/results.html:16 +#: searx/templates/legacy/results.html:17 +#: searx/templates/oscar/results.html:141 +#: searx/templates/simple/results.html:62 +msgid "Download results" +msgstr "下載結果" + +#: searx/templates/courgette/results.html:34 +#: searx/templates/legacy/results.html:35 +#: searx/templates/simple/results.html:10 +msgid "Answers" +msgstr "答案" + +#: searx/templates/courgette/results.html:42 +#: searx/templates/legacy/results.html:43 +#: searx/templates/oscar/results.html:116 +#: searx/templates/simple/results.html:42 +msgid "Suggestions" +msgstr "建議" + +#: searx/templates/courgette/results.html:70 +#: searx/templates/legacy/results.html:81 +#: searx/templates/oscar/results.html:68 searx/templates/oscar/results.html:78 +#: searx/templates/simple/results.html:130 +msgid "previous page" +msgstr "上一頁" + +#: searx/templates/courgette/results.html:81 +#: searx/templates/legacy/results.html:92 +#: searx/templates/oscar/results.html:62 searx/templates/oscar/results.html:84 +#: searx/templates/simple/results.html:145 +msgid "next page" +msgstr "下一頁" + +#: searx/templates/courgette/search.html:3 +#: searx/templates/legacy/search.html:3 searx/templates/oscar/search.html:6 +#: searx/templates/oscar/search_full.html:9 +#: searx/templates/pix-art/search.html:3 searx/templates/simple/search.html:4 +msgid "Search for..." +msgstr "搜尋……" + +#: searx/templates/courgette/stats.html:4 searx/templates/legacy/stats.html:4 +#: searx/templates/oscar/stats.html:5 searx/templates/pix-art/stats.html:4 +#: searx/templates/simple/stats.html:7 +msgid "Engine stats" +msgstr "引擎統計" + +#: searx/templates/courgette/result_templates/images.html:4 +#: searx/templates/legacy/result_templates/images.html:4 +#: searx/templates/pix-art/result_templates/images.html:4 +msgid "original context" +msgstr "原始內容" + +#: searx/templates/courgette/result_templates/torrent.html:7 +#: searx/templates/legacy/result_templates/torrent.html:11 +#: searx/templates/oscar/result_templates/torrent.html:6 +#: searx/templates/simple/result_templates/torrent.html:9 +msgid "Seeder" +msgstr "播種者" + +#: searx/templates/courgette/result_templates/torrent.html:7 +#: searx/templates/legacy/result_templates/torrent.html:11 +#: searx/templates/oscar/result_templates/torrent.html:6 +#: searx/templates/simple/result_templates/torrent.html:9 +msgid "Leecher" +msgstr "接收者" + +#: searx/templates/courgette/result_templates/torrent.html:9 +#: searx/templates/legacy/result_templates/torrent.html:9 +#: searx/templates/oscar/macros.html:23 +#: searx/templates/simple/result_templates/torrent.html:6 +msgid "magnet link" +msgstr "磁力連結" + +#: searx/templates/courgette/result_templates/torrent.html:10 +#: searx/templates/legacy/result_templates/torrent.html:10 +#: searx/templates/oscar/macros.html:24 +#: searx/templates/simple/result_templates/torrent.html:7 +msgid "torrent file" +msgstr "torrent 檔案" + +#: searx/templates/legacy/categories.html:8 +#: searx/templates/simple/categories.html:6 +msgid "Click on the magnifier to perform search" +msgstr "在磁鐵上點選以執行搜尋" + +#: searx/templates/legacy/preferences.html:84 +#: searx/templates/oscar/preferences.html:113 +#: searx/templates/simple/preferences.html:142 +msgid "Results on new tabs" +msgstr "在新分頁開啟結果" + +#: searx/templates/legacy/preferences.html:87 +#: searx/templates/oscar/preferences.html:117 +#: searx/templates/simple/preferences.html:145 +msgid "On" +msgstr "開啟" + +#: searx/templates/legacy/preferences.html:88 +#: searx/templates/oscar/preferences.html:118 +#: searx/templates/simple/preferences.html:146 +msgid "Off" +msgstr "關閉" + +#: searx/templates/legacy/result_templates/code.html:3 +#: searx/templates/legacy/result_templates/default.html:3 +#: searx/templates/legacy/result_templates/map.html:9 +#: searx/templates/oscar/macros.html:34 searx/templates/oscar/macros.html:48 +#: searx/templates/simple/macros.html:43 +msgid "cached" +msgstr "已快取" + +#: searx/templates/oscar/advanced.html:4 +msgid "Advanced settings" +msgstr "進階設定" + +#: searx/templates/oscar/base.html:62 +#: searx/templates/oscar/messages/first_time.html:4 +#: searx/templates/oscar/messages/save_settings_successfull.html:5 +#: searx/templates/oscar/messages/unknow_error.html:5 +msgid "Close" +msgstr "關閉" + +#: searx/templates/oscar/base.html:64 +#: searx/templates/oscar/messages/no_results.html:4 +#: searx/templates/simple/messages/no_results.html:4 +#: searx/templates/simple/results.html:25 +msgid "Error!" +msgstr "錯誤！" + +#: searx/templates/oscar/base.html:90 searx/templates/simple/base.html:55 +msgid "Powered by" +msgstr "技術支援" + +#: searx/templates/oscar/base.html:90 searx/templates/simple/base.html:55 +msgid "a privacy-respecting, hackable metasearch engine" +msgstr "一個尊重隱私，可再開發的集合式搜尋引擎" + +#: searx/templates/oscar/macros.html:36 searx/templates/oscar/macros.html:50 +#: searx/templates/simple/macros.html:43 +msgid "proxied" +msgstr "已代理" + +#: searx/templates/oscar/macros.html:92 +msgid "supported" +msgstr "支援" + +#: searx/templates/oscar/macros.html:96 +msgid "not supported" +msgstr "不支援" + +#: searx/templates/oscar/preferences.html:13 +#: searx/templates/oscar/preferences.html:22 +#: searx/templates/simple/preferences.html:32 +msgid "General" +msgstr "一般" + +#: searx/templates/oscar/preferences.html:14 +#: searx/templates/oscar/preferences.html:146 +#: searx/templates/simple/preferences.html:76 +msgid "Engines" +msgstr "引擎" + +#: searx/templates/oscar/preferences.html:15 +#: searx/templates/oscar/preferences.html:219 +msgid "Plugins" +msgstr "外掛程式" + +#: searx/templates/oscar/preferences.html:16 +#: searx/templates/oscar/preferences.html:245 +msgid "Answerers" +msgstr "答案" + +#: searx/templates/oscar/preferences.html:17 +#: searx/templates/oscar/preferences.html:272 +msgid "Cookies" +msgstr "Cookies" + +#: searx/templates/oscar/preferences.html:42 +#: searx/templates/simple/preferences.html:48 +msgid "What language do you prefer for search?" +msgstr "您偏好用哪種語言搜尋？" + +#: searx/templates/oscar/preferences.html:48 +#: searx/templates/simple/preferences.html:128 +msgid "Change the language of the layout" +msgstr "變更佈局的語言" + +#: searx/templates/oscar/preferences.html:58 +#: searx/templates/simple/preferences.html:60 +msgid "Find stuff as you type" +msgstr "隨打即找" + +#: searx/templates/oscar/preferences.html:69 +#: searx/templates/simple/preferences.html:173 +msgid "Proxying image results through searx" +msgstr "透過 searx 代理圖片結果" + +#: searx/templates/oscar/preferences.html:78 +msgid "" +"Change how forms are submited, <a " +"href=\"http://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods\"" +" rel=\"external\">learn more about request methods</a>" +msgstr "變更遞交形式，<a href=\"https://zh.wikipedia.org/wiki/%E8%B6%85%E6%96%87%E6%9C%AC%E4%BC%A0%E8%BE%93%E5%8D%8F%E8%AE%AE#%E8%AF%B7%E6%B1%82%E6%96%B9%E6%B3%95\" rel=\"external\">看看更多關於請求方法的介紹</a>" + +#: searx/templates/oscar/preferences.html:87 +#: searx/templates/simple/preferences.html:71 +msgid "Filter content" +msgstr "過濾內容" + +#: searx/templates/oscar/preferences.html:97 +#: searx/templates/simple/preferences.html:139 +msgid "Change searx layout" +msgstr "變更 searx 佈局" + +#: searx/templates/oscar/preferences.html:106 +#: searx/templates/oscar/preferences.html:111 +msgid "Choose style for this theme" +msgstr "選擇這個主題的樣式" + +#: searx/templates/oscar/preferences.html:106 +#: searx/templates/oscar/preferences.html:111 +msgid "Style" +msgstr "樣式" + +#: searx/templates/oscar/preferences.html:122 +msgid "Open Access DOI resolver" +msgstr "開放存取 DOI 解析器" + +#: searx/templates/oscar/preferences.html:123 +msgid "" +"Redirect to open-access versions of publications when available (plugin " +"required)" +msgstr "盡可能重新導向至出版品的開放存取版本（需要外掛程式）" + +#: searx/templates/oscar/preferences.html:163 +#: searx/templates/oscar/preferences.html:175 +#: searx/templates/simple/preferences.html:88 +msgid "Shortcut" +msgstr "快捷鍵" + +#: searx/templates/oscar/preferences.html:164 +#: searx/templates/oscar/preferences.html:174 +msgid "Selected language" +msgstr "已選取的語言" + +#: searx/templates/oscar/preferences.html:166 +#: searx/templates/oscar/preferences.html:172 +#: searx/templates/simple/preferences.html:91 +msgid "Time range" +msgstr "時間範圍" + +#: searx/templates/oscar/preferences.html:167 +#: searx/templates/oscar/preferences.html:171 +#: searx/templates/simple/preferences.html:92 +msgid "Avg. time" +msgstr "平均時間" + +#: searx/templates/oscar/preferences.html:168 +#: searx/templates/oscar/preferences.html:170 +#: searx/templates/simple/preferences.html:93 +msgid "Max time" +msgstr "最大時間" + +#: searx/templates/oscar/preferences.html:248 +msgid "This is the list of searx's instant answering modules." +msgstr "這是 searx 的即時回覆模組清單。" + +#: searx/templates/oscar/preferences.html:252 +msgid "Name" +msgstr "名稱" + +#: searx/templates/oscar/preferences.html:253 +msgid "Keywords" +msgstr "關鍵字" + +#: searx/templates/oscar/preferences.html:254 +msgid "Description" +msgstr "描述" + +#: searx/templates/oscar/preferences.html:255 +msgid "Examples" +msgstr "範例" + +#: searx/templates/oscar/preferences.html:275 +msgid "" +"This is the list of cookies and their values searx is storing on your " +"computer." +msgstr "這是 searx 儲存在您電腦上的 cookies 與它們的值的清單。" + +#: searx/templates/oscar/preferences.html:276 +msgid "With that list, you can assess searx transparency." +msgstr "有了這份清單，您就可以評估 searx 的透明度。" + +#: searx/templates/oscar/preferences.html:281 +msgid "Cookie name" +msgstr "Cookie 名稱" + +#: searx/templates/oscar/preferences.html:282 +msgid "Value" +msgstr "值" + +#: searx/templates/oscar/preferences.html:301 +msgid "Search URL of the currently saved preferences" +msgstr "目前偏好設定的搜尋 URL" + +#: searx/templates/oscar/preferences.html:301 +msgid "" +"Note: specifying custom settings in the search URL can reduce privacy by " +"leaking data to the clicked result sites." +msgstr "注意：在搜尋 URL 中指定自訂的設定可能會降低隱私，因為會洩漏資料給點選的結果頁面。" + +#: searx/templates/oscar/results.html:17 +msgid "Search results" +msgstr "搜尋結果" + +#: searx/templates/oscar/results.html:21 +#: searx/templates/simple/results.html:84 +msgid "Try searching for:" +msgstr "嘗試搜尋：" + +#: searx/templates/oscar/results.html:100 +#: searx/templates/simple/results.html:25 +msgid "Engines cannot retrieve results" +msgstr "引擎無法擷取結果" + +#: searx/templates/oscar/results.html:131 +msgid "Links" +msgstr "連結" + +#: searx/templates/oscar/search.html:8 +#: searx/templates/oscar/search_full.html:11 +#: searx/templates/simple/search.html:5 +msgid "Start search" +msgstr "開始搜尋" + +#: searx/templates/oscar/stats.html:2 +msgid "stats" +msgstr "統計" + +#: searx/templates/oscar/time-range.html:3 +#: searx/templates/simple/time-range.html:3 +msgid "Anytime" +msgstr "任何時間" + +#: searx/templates/oscar/time-range.html:6 +#: searx/templates/simple/time-range.html:6 +msgid "Last day" +msgstr "一天內" + +#: searx/templates/oscar/time-range.html:9 +#: searx/templates/simple/time-range.html:9 +msgid "Last week" +msgstr "一週內" + +#: searx/templates/oscar/time-range.html:12 +#: searx/templates/simple/time-range.html:12 +msgid "Last month" +msgstr "一個月內" + +#: searx/templates/oscar/time-range.html:15 +#: searx/templates/simple/time-range.html:15 +msgid "Last year" +msgstr "一年內" + +#: searx/templates/oscar/messages/first_time.html:6 +#: searx/templates/oscar/messages/no_data_available.html:3 +msgid "Heads up!" +msgstr "注意！" + +#: searx/templates/oscar/messages/first_time.html:7 +msgid "It look like you are using searx first time." +msgstr "看起來您是第一次使用 searx。" + +#: searx/templates/oscar/messages/no_cookies.html:3 +msgid "Information!" +msgstr "資訊！" + +#: searx/templates/oscar/messages/no_cookies.html:4 +msgid "currently, there are no cookies defined." +msgstr "目前未有已定義的 cookies。" + +#: searx/templates/oscar/messages/no_data_available.html:4 +msgid "There is currently no data available. " +msgstr "目前無可用資料。" + +#: searx/templates/oscar/messages/no_results.html:4 +#: searx/templates/simple/messages/no_results.html:4 +msgid "Engines cannot retrieve results." +msgstr "引擎無法擷取結果。" + +#: searx/templates/oscar/messages/no_results.html:10 +#: searx/templates/simple/messages/no_results.html:10 +msgid "Please, try again later or find another searx instance." +msgstr "請再試一次或是使用其他 searx 實體搜尋。" + +#: searx/templates/oscar/messages/no_results.html:14 +#: searx/templates/simple/messages/no_results.html:14 +msgid "Sorry!" +msgstr "抱歉！" + +#: searx/templates/oscar/messages/no_results.html:15 +#: searx/templates/simple/messages/no_results.html:15 +msgid "" +"we didn't find any results. Please use another query or search in more " +"categories." +msgstr "我們找不到任何結果。請使用其他搜尋方式或在更多分類中搜尋。" + +#: searx/templates/oscar/messages/save_settings_successfull.html:7 +msgid "Well done!" +msgstr "很好！" + +#: searx/templates/oscar/messages/save_settings_successfull.html:8 +msgid "Settings saved successfully." +msgstr "設定成功儲存。" + +#: searx/templates/oscar/messages/unknow_error.html:7 +msgid "Oh snap!" +msgstr "糟糕！" + +#: searx/templates/oscar/messages/unknow_error.html:8 +msgid "Something went wrong." +msgstr "發生了一點問題。" + +#: searx/templates/oscar/result_templates/default.html:7 +#: searx/templates/simple/result_templates/default.html:6 +msgid "show media" +msgstr "顯示媒體" + +#: searx/templates/oscar/result_templates/default.html:7 +#: searx/templates/simple/result_templates/default.html:6 +msgid "hide media" +msgstr "隱藏媒體" + +#: searx/templates/oscar/result_templates/images.html:30 +msgid "Get image" +msgstr "取得圖片" + +#: searx/templates/oscar/result_templates/images.html:33 +msgid "View source" +msgstr "檢視來源" + +#: searx/templates/oscar/result_templates/map.html:7 +#: searx/templates/simple/result_templates/map.html:7 +msgid "show map" +msgstr "顯示地圖" + +#: searx/templates/oscar/result_templates/map.html:7 +#: searx/templates/simple/result_templates/map.html:7 +msgid "hide map" +msgstr "隱藏地圖" + +#: searx/templates/oscar/result_templates/map.html:11 +#: searx/templates/simple/result_templates/map.html:11 +msgid "show details" +msgstr "顯示詳情" + +#: searx/templates/oscar/result_templates/map.html:11 +#: searx/templates/simple/result_templates/map.html:11 +msgid "hide details" +msgstr "隱藏詳情" + +#: searx/templates/oscar/result_templates/torrent.html:7 +#: searx/templates/simple/result_templates/torrent.html:11 +msgid "Filesize" +msgstr "檔案大小" + +#: searx/templates/oscar/result_templates/torrent.html:9 +#: searx/templates/simple/result_templates/torrent.html:12 +msgid "Bytes" +msgstr "位元組" + +#: searx/templates/oscar/result_templates/torrent.html:10 +#: searx/templates/simple/result_templates/torrent.html:13 +msgid "kiB" +msgstr "kiB" + +#: searx/templates/oscar/result_templates/torrent.html:11 +#: searx/templates/simple/result_templates/torrent.html:14 +msgid "MiB" +msgstr "MiB" + +#: searx/templates/oscar/result_templates/torrent.html:12 +#: searx/templates/simple/result_templates/torrent.html:15 +msgid "GiB" +msgstr "GiB" + +#: searx/templates/oscar/result_templates/torrent.html:13 +#: searx/templates/simple/result_templates/torrent.html:16 +msgid "TiB" +msgstr "TiB" + +#: searx/templates/oscar/result_templates/torrent.html:15 +#: searx/templates/simple/result_templates/torrent.html:20 +msgid "Number of Files" +msgstr "檔案數量" + +#: searx/templates/oscar/result_templates/videos.html:7 +#: searx/templates/simple/result_templates/videos.html:6 +msgid "show video" +msgstr "顯示影片" + +#: searx/templates/oscar/result_templates/videos.html:7 +#: searx/templates/simple/result_templates/videos.html:6 +msgid "hide video" +msgstr "隱藏影片" + +#: searx/templates/pix-art/results.html:28 +msgid "Load more..." +msgstr "載入更多……" + +#: searx/templates/simple/base.html:31 +msgid "No item found" +msgstr "找不到項目" + +#: searx/templates/simple/preferences.html:89 +msgid "Supports selected language" +msgstr "支援選定的語言" + +#: searx/templates/simple/preferences.html:118 +msgid "User interface" +msgstr "使用者介面" + +#: searx/templates/simple/preferences.html:154 +msgid "Privacy" +msgstr "隱私" diff --git a/searx/version.py b/searx/version.py index 11dfb1eeff..4e149722e5 100644 --- a/searx/version.py +++ b/searx/version.py @@ -18,7 +18,7 @@ # version of searx VERSION_MAJOR = 0 -VERSION_MINOR = 14 +VERSION_MINOR = 15 VERSION_BUILD = 0 VERSION_STRING = "{0}.{1}.{2}".format(VERSION_MAJOR,
UTNkar__moore-554	Fix cookies for Utnarm Utnarm recently switched to utnarm.se instead of utnarm.utn.se. This lead to that you can’t sign in to utnarm.se. Per default, moore uses utn.se as cookie domain and since utnarm.se is a different top level domain the cookies can’t be used. We need to dynamically add utnarm.se as a cookie domain. This python package might be useful https://github.com/ViktorStiskala/django-shared-session	[ { "content": "\"\"\"\nDjango settings for the production environment of Project Moore.\n\nFor more information regarding running in production see,\nSee https://docs.djangoproject.com/en/1.10/howto/deployment/checklist/\n\nFor more information on this file, see\nhttps://docs.djangoproject.com/en/1.10/topics/set...	[ { "content": "\"\"\"\nDjango settings for the production environment of Project Moore.\n\nFor more information regarding running in production see,\nSee https://docs.djangoproject.com/en/1.10/howto/deployment/checklist/\n\nFor more information on this file, see\nhttps://docs.djangoproject.com/en/1.10/topics/set...	diff --git a/src/moore/settings/production.py b/src/moore/settings/production.py index 9fca8dec..4dd269e0 100644 --- a/src/moore/settings/production.py +++ b/src/moore/settings/production.py @@ -106,8 +106,6 @@ CSRF_COOKIE_SECURE = True -SESSION_COOKIE_DOMAIN = '.utn.se' - SESSION_COOKIE_SECURE = True MELOS_URL = os.environ.get('MELOS_URL')
chainer__chainer-1568	Inconsistency between cupy.dstack and numpy.dstack ``` In [10]: import cupy, numpy In [11]: a = cupy.arange(24).reshape(2, 3, 4) In [12]: numpy.dstack((a.get(),)) Out[12]: array([[[ 0, 1, 2, 3], [ 4, 5, 6, 7], [ 8, 9, 10, 11]], [[12, 13, 14, 15], [16, 17, 18, 19], [20, 21, 22, 23]]]) In [13]: cupy.dstack((a,)) --------------------------------------------------------------------------- IndexError Traceback (most recent call last) <ipython-input-13-aa573685da21> in <module>() ----> 1 cupy.dstack((a,)) /home/delta/dev/chainer/cupy/manipulation/join.py in dstack(tup) 101 102 """ --> 103 return concatenate(cupy.atleast_3d(*tup), 2) 104 105 /home/delta/dev/chainer/cupy/manipulation/join.py in concatenate(tup, axis) 59 ndim = a.ndim 60 shape = list(a.shape) ---> 61 axis = _get_positive_axis(a.ndim, axis) 62 continue 63 /home/delta/dev/chainer/cupy/manipulation/join.py in _get_positive_axis(ndim, axis) 167 a += ndim 168 if a < 0 or a >= ndim: --> 169 raise IndexError('axis {} out of bounds [0, {})'.format(axis, ndim)) 170 return a IndexError: axis 2 out of bounds [0, 2) ```	[ { "content": "import numpy\nimport six\n\nimport cupy\n\n\ndef column_stack(tup):\n \"\"\"Stacks 1-D and 2-D arrays as columns into a 2-D array.\n\n A 1-D array is first converted to a 2-D column array. Then, the 2-D arrays\n are concatenated along the second axis.\n\n Args:\n tup (sequence o...	[ { "content": "import numpy\nimport six\n\nimport cupy\n\n\ndef column_stack(tup):\n \"\"\"Stacks 1-D and 2-D arrays as columns into a 2-D array.\n\n A 1-D array is first converted to a 2-D column array. Then, the 2-D arrays\n are concatenated along the second axis.\n\n Args:\n tup (sequence o...	diff --git a/cupy/manipulation/join.py b/cupy/manipulation/join.py index 14165a8ff2f0..6e077d78221b 100644 --- a/cupy/manipulation/join.py +++ b/cupy/manipulation/join.py @@ -100,7 +100,7 @@ def dstack(tup): .. seealso:: :func:`numpy.dstack` """ - return concatenate(cupy.atleast_3d(*tup), 2) + return concatenate([cupy.atleast_3d(m) for m in tup], 2) def hstack(tup): diff --git a/tests/cupy_tests/manipulation_tests/test_join.py b/tests/cupy_tests/manipulation_tests/test_join.py index 949ea1406001..e37ab83b5405 100644 --- a/tests/cupy_tests/manipulation_tests/test_join.py +++ b/tests/cupy_tests/manipulation_tests/test_join.py @@ -73,6 +73,21 @@ def test_dstack(self, xp): c = testing.shaped_arange((1, 3), xp) return xp.dstack((a, b, c)) + @testing.numpy_cupy_array_equal() + def test_dstack_single_element(self, xp): + a = testing.shaped_arange((1, 2, 3), xp) + return xp.dstack((a,)) + + @testing.numpy_cupy_array_equal() + def test_dstack_single_element_2(self, xp): + a = testing.shaped_arange((1, 2), xp) + return xp.dstack((a,)) + + @testing.numpy_cupy_array_equal() + def test_dstack_single_element_3(self, xp): + a = testing.shaped_arange((1,), xp) + return xp.dstack((a,)) + @testing.numpy_cupy_array_equal() def test_hstack_vectors(self, xp): a = xp.arange(3)
talonhub__community-740	auto_insert is documented to call auto_format I understand if you want to override `auto_insert` too because you're adjusting the cursor position afterwards, but the general intention is for `auto_format` to do text formatting I think the dictation `auto_insert()` implementation should potentially first `text = auto_format(text)` (which is the identity function by default) as per the docstring: ``` auto_insert(text: str) Insert text at the current cursor position, automatically formatting it using actions.auto_format(text) ``` https://github.com/knausj85/knausj_talon/blob/master/code/dictation.py#L401	[ { "content": "# Descended from https://github.com/dwiel/talon_community/blob/master/misc/dictation.py\nfrom talon import Module, Context, ui, actions, clip, app, grammar\nfrom typing import Optional, Tuple, Literal, Callable\nimport re\n\nmod = Module()\n\nsetting_context_sensitive_dictation = mod.setting(\n ...	[ { "content": "# Descended from https://github.com/dwiel/talon_community/blob/master/misc/dictation.py\nfrom talon import Module, Context, ui, actions, clip, app, grammar\nfrom typing import Optional, Tuple, Literal, Callable\nimport re\n\nmod = Module()\n\nsetting_context_sensitive_dictation = mod.setting(\n ...	diff --git a/code/dictation.py b/code/dictation.py index c0229af1ac..d25fb9c506 100644 --- a/code/dictation.py +++ b/code/dictation.py @@ -398,4 +398,5 @@ def dictation_peek_right() -> Optional[str]: @dictation_ctx.action_class("main") class main_action: - def auto_insert(text): actions.user.dictation_insert(text) + def auto_insert(text): + actions.user.dictation_insert(actions.auto_format(text))
mlflow__mlflow-4368	Make mlflow compatible with protobuf 3.6.1 ## What changes are proposed in this pull request? Make mlflow compatible with protobuf 3.6.1: for protobuf ==3.6.1 Add EnumTypeWrapper.__getattr__ to access values ## How is this patch tested? N/A ## Release Notes ### Is this a user-facing change? - [x] No. You can skip the rest of this section. - [ ] Yes. Give a description of this change to be included in the release notes for MLflow users. (Details in 1-2 sentences. You can just refer to another PR with a description if this PR is part of a larger change.) ### What component(s), interfaces, languages, and integrations does this PR affect? Components - [ ] `area/artifacts`: Artifact stores and artifact logging - [ ] `area/build`: Build and test infrastructure for MLflow - [ ] `area/docs`: MLflow documentation pages - [ ] `area/examples`: Example code - [ ] `area/model-registry`: Model Registry service, APIs, and the fluent client calls for Model Registry - [ ] `area/models`: MLmodel format, model serialization/deserialization, flavors - [ ] `area/projects`: MLproject format, project running backends - [ ] `area/scoring`: Local serving, model deployment tools, spark UDFs - [ ] `area/server-infra`: MLflow server, JavaScript dev server - [x] `area/tracking`: Tracking Service, tracking client APIs, autologging Interface - [ ] `area/uiux`: Front-end, user experience, JavaScript, plotting - [ ] `area/docker`: Docker use across MLflow's components, such as MLflow Projects and MLflow Models - [ ] `area/sqlalchemy`: Use of SQLAlchemy in the Tracking Service or Model Registry - [ ] `area/windows`: Windows support Language - [ ] `language/r`: R APIs and clients - [ ] `language/java`: Java APIs and clients - [ ] `language/new`: Proposals for new client languages Integrations - [ ] `integrations/azure`: Azure and Azure ML integrations - [ ] `integrations/sagemaker`: SageMaker integrations - [ ] `integrations/databricks`: Databricks integrations <!-- Insert an empty named anchor here to allow jumping to this section with a fragment URL (e.g. https://github.com/mlflow/mlflow/pull/123#user-content-release-note-category). Note that GitHub prefixes anchor names in markdown with "user-content-". --> <a name="release-note-category"></a> ### How should the PR be classified in the release notes? Choose one: - [ ] `rn/breaking-change` - The PR will be mentioned in the "Breaking Changes" section - [x] `rn/none` - No description will be included. The PR will be mentioned only by the PR number in the "Small Bugfixes and Documentation Updates" section - [ ] `rn/feature` - A new user-facing feature worth mentioning in the release notes - [ ] `rn/bug-fix` - A user-facing bug fix worth mentioning in the release notes - [ ] `rn/documentation` - A user-facing documentation change worth mentioning in the release notes	[ { "content": "import os\nimport logging\n\nfrom importlib.machinery import SourceFileLoader\nfrom setuptools import setup, find_packages\n\n_MLFLOW_SKINNY_ENV_VAR = \"MLFLOW_SKINNY\"\n\nversion = (\n SourceFileLoader(\"mlflow.version\", os.path.join(\"mlflow\", \"version.py\")).load_module().VERSION\n)\n\n\n...	[ { "content": "import os\nimport logging\n\nfrom importlib.machinery import SourceFileLoader\nfrom setuptools import setup, find_packages\n\n_MLFLOW_SKINNY_ENV_VAR = \"MLFLOW_SKINNY\"\n\nversion = (\n SourceFileLoader(\"mlflow.version\", os.path.join(\"mlflow\", \"version.py\")).load_module().VERSION\n)\n\n\n...	diff --git a/setup.py b/setup.py index 1a98478b5e3d4..186d2f67fbf30 100644 --- a/setup.py +++ b/setup.py @@ -43,7 +43,7 @@ def package_files(directory): "entrypoints", "gitpython>=2.1.0", "pyyaml", - "protobuf>=3.6.0", + "protobuf>=3.7.0", "pytz", "requests>=2.17.3", "packaging",
google__turbinia-616	Add retries to tox Tox fails when trying to check links within our docs if the link is temporarily down/unresponsive. Adding retries to sphinx config should take care of that.	[ { "content": "# Configuration file for the Sphinx documentation builder.\n#\n# This file only contains a selection of the most common options. For a full\n# list see the documentation:\n# https://www.sphinx-doc.org/en/master/usage/configuration.html\n\n# -- Path setup -------------------------------------------...	[ { "content": "# Configuration file for the Sphinx documentation builder.\n#\n# This file only contains a selection of the most common options. For a full\n# list see the documentation:\n# https://www.sphinx-doc.org/en/master/usage/configuration.html\n\n# -- Path setup -------------------------------------------...	diff --git a/docs/conf.py b/docs/conf.py index 68dbdd555..a0c2084bb 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -76,6 +76,8 @@ ] } +# Adding retries to linkchecks before declaring a link broken +linkcheck_retries = 3 # Output file base name for HTML help builder. htmlhelp_basename = 'turbiniadoc'
getmoto__moto-1992	Replace pyaml dependency with PyYAML There is a dependency on pyaml in setup.py: https://github.com/spulec/moto/blob/master/setup.py#L18 I think that this is intended to be PyYAML (which pyaml depends on), and I do not see any usages of pyaml itself in this codebase. pyaml uses WTFPL (https://github.com/mk-fg/pretty-yaml/blob/master/COPYING) which is not approved by the OSI (https://opensource.org/minutes20090304)	[ { "content": "#!/usr/bin/env python\nfrom __future__ import unicode_literals\nimport setuptools\nfrom setuptools import setup, find_packages\nimport sys\n\n\ninstall_requires = [\n \"Jinja2>=2.7.3\",\n \"boto>=2.36.0\",\n \"boto3>=1.6.16\",\n \"botocore>=1.12.13\",\n \"cryptography>=2.3.0\",\n ...	[ { "content": "#!/usr/bin/env python\nfrom __future__ import unicode_literals\nimport setuptools\nfrom setuptools import setup, find_packages\nimport sys\n\n\ninstall_requires = [\n \"Jinja2>=2.7.3\",\n \"boto>=2.36.0\",\n \"boto3>=1.6.16\",\n \"botocore>=1.12.13\",\n \"cryptography>=2.3.0\",\n ...	diff --git a/setup.py b/setup.py index a1b8c5daecbe..0598d7a10aa7 100755 --- a/setup.py +++ b/setup.py @@ -15,7 +15,7 @@ "xmltodict", "six>1.9", "werkzeug", - "pyaml", + "PyYAML", "pytz", "python-dateutil<3.0.0,>=2.1", "python-jose<3.0.0",
Nitrate__Nitrate-527	Remove dependency mock Use `unittest.mock` instead.	[ { "content": "# -- coding: utf-8 --\n\nfrom setuptools import setup, find_packages\n\n\nwith open('VERSION.txt', 'r') as f:\n pkg_version = f.read().strip()\n\n\ndef get_long_description():\n with open('README.rst', 'r') as f:\n return f.read()\n\n\ninstall_requires = [\n 'beautifulsoup4 >= 4....	[ { "content": "# -- coding: utf-8 --\n\nfrom setuptools import setup, find_packages\n\n\nwith open('VERSION.txt', 'r') as f:\n pkg_version = f.read().strip()\n\n\ndef get_long_description():\n with open('README.rst', 'r') as f:\n return f.read()\n\n\ninstall_requires = [\n 'beautifulsoup4 >= 4....	diff --git a/setup.py b/setup.py index 80906912..f0b2be6b 100644 --- a/setup.py +++ b/setup.py @@ -46,7 +46,6 @@ def get_long_description(): 'coverage', 'factory_boy', 'flake8', - 'mock', 'pytest', 'pytest-cov', 'pytest-django', diff --git a/src/tests/core/test_commands.py b/src/tests/core/test_commands.py index a375629c..b2a83775 100644 --- a/src/tests/core/test_commands.py +++ b/src/tests/core/test_commands.py @@ -1,7 +1,7 @@ # -- coding: utf-8 -- from django.contrib.auth.models import Group -from mock import patch +from unittest.mock import patch from django import test from django.core.management import call_command diff --git a/src/tests/core/test_core.py b/src/tests/core/test_core.py index 96388ed9..194a1ac9 100644 --- a/src/tests/core/test_core.py +++ b/src/tests/core/test_core.py @@ -2,8 +2,7 @@ import sys import unittest -from mock import patch -from mock import Mock +from unittest.mock import patch, Mock from django import test from django.conf import settings diff --git a/src/tests/core/test_files.py b/src/tests/core/test_files.py index 62e0aa46..0a449f4b 100644 --- a/src/tests/core/test_files.py +++ b/src/tests/core/test_files.py @@ -11,7 +11,7 @@ from django.test import RequestFactory from django.urls import reverse from django.conf import settings -from mock import patch +from unittest.mock import patch from tcms.core.files import able_to_delete_attachment from tcms.management.models import TestAttachment diff --git a/src/tests/issuetracker/test_services.py b/src/tests/issuetracker/test_services.py index 408000b4..f8f5716e 100644 --- a/src/tests/issuetracker/test_services.py +++ b/src/tests/issuetracker/test_services.py @@ -3,7 +3,7 @@ import unittest from django import test -from mock import Mock +from unittest.mock import Mock from tcms.issuetracker import services from tcms.issuetracker.services import IssueTrackerService diff --git a/src/tests/issuetracker/test_task.py b/src/tests/issuetracker/test_task.py index e8f8b3f5..8e4fb306 100644 --- a/src/tests/issuetracker/test_task.py +++ b/src/tests/issuetracker/test_task.py @@ -2,7 +2,7 @@ import unittest -from mock import patch, Mock +from unittest.mock import patch, Mock from tcms.issuetracker.task import bugzilla_external_track diff --git a/src/tests/test_auth.py b/src/tests/test_auth.py index 1806ae05..5810c48b 100644 --- a/src/tests/test_auth.py +++ b/src/tests/test_auth.py @@ -3,7 +3,7 @@ import datetime from hashlib import sha1 -from mock import patch +from unittest.mock import patch from django.conf import settings from django.contrib.auth.models import User diff --git a/src/tests/testcases/test_models.py b/src/tests/testcases/test_models.py index b1f25852..0814583b 100644 --- a/src/tests/testcases/test_models.py +++ b/src/tests/testcases/test_models.py @@ -1,7 +1,7 @@ # -- coding: utf-8 -- from datetime import timedelta -from mock import patch +from unittest.mock import patch from django.contrib.auth.models import User from django.core import mail diff --git a/src/tests/testcases/test_views.py b/src/tests/testcases/test_views.py index 7b58d714..fd8caedf 100644 --- a/src/tests/testcases/test_views.py +++ b/src/tests/testcases/test_views.py @@ -7,8 +7,7 @@ from bs4 import BeautifulSoup from datetime import datetime, timedelta from operator import attrgetter, itemgetter - -import mock +from unittest.mock import patch from django import test from django.contrib.auth.models import User @@ -62,13 +61,13 @@ def test_get_plan_id_from_post_request(self): pk = plan_from_request_or_none(request, pk_enough=True) self.assertEqual(1, pk) - @mock.patch('tcms.testcases.views.get_object_or_404') + @patch('tcms.testcases.views.get_object_or_404') def test_get_plan_object_from_get_request(self, get_object_or_404): request = self.factory.get('/uri', data={'from_plan': 1}) plan = plan_from_request_or_none(request) self.assertEqual(get_object_or_404.return_value, plan) - @mock.patch('tcms.testcases.views.get_object_or_404') + @patch('tcms.testcases.views.get_object_or_404') def test_get_plan_object_from_post_request(self, get_object_or_404): request = self.factory.post('/uri', data={'from_plan': 1}) plan = plan_from_request_or_none(request) @@ -84,14 +83,14 @@ def test_missing_plan_id_in_post_request(self): plan = plan_from_request_or_none(request) self.assertIsNone(plan) - @mock.patch('tcms.testcases.views.get_object_or_404') + @patch('tcms.testcases.views.get_object_or_404') def test_nonexisting_plan_id_from_get_request(self, get_object_or_404): get_object_or_404.side_effect = Http404 request = self.factory.get('/uri', data={'from_plan': 1}) self.assertRaises(Http404, plan_from_request_or_none, request) - @mock.patch('tcms.testcases.views.get_object_or_404') + @patch('tcms.testcases.views.get_object_or_404') def test_nonexisting_plan_id_from_post_request(self, get_object_or_404): get_object_or_404.side_effect = Http404 @@ -352,7 +351,7 @@ def test_fail_to_remove_if_component_not_exist(self): data = json.loads(resp.content) self.assertIn('Cannot remove component', data['response']) - @mock.patch('tcms.testcases.models.TestCase.remove_component') + @patch('tcms.testcases.models.TestCase.remove_component') def test_case_remove_component_fails(self, remove_component): remove_component.side_effect = Exception @@ -682,8 +681,8 @@ def test_remove_tags_from_cases(self): TestCaseTag.objects.filter( case=self.case_3.pk, tag=self.tag_python.pk).exists()) - @mock.patch('tcms.testcases.models.TestCase.remove_tag', - side_effect=ValueError('value error')) + @patch('tcms.testcases.models.TestCase.remove_tag', + side_effect=ValueError('value error')) def test_ensure_response_if_error_happens_when_remove_tag(self, remove_tag): # This test does not care about what tags are removed from which cases response = self.client.post( @@ -1535,7 +1534,7 @@ def test_create_new_plan_case_rel_sort_key_for_link(self): orig_plan=self.orphan_plan, copy_case=False) - @mock.patch('tcms.testplans.models.TestPlan.get_case_sortkey') + @patch('tcms.testplans.models.TestPlan.get_case_sortkey') def test_clone_to_same_plan(self, get_case_sortkey): # Make it easier to assert the new sort key. get_case_sortkey.return_value = 100 @@ -1783,7 +1782,7 @@ def test_invalid_arguments(self): data = json.loads(resp.content) self.assertIn('Cannot add component', data['response']) - @mock.patch('tcms.testcases.models.TestCase.add_component') + @patch('tcms.testcases.models.TestCase.add_component') def test_failed_to_add_component(self, add_component): add_component.side_effect = ValueError @@ -1933,7 +1932,7 @@ def test_invalid_input_for_adding_an_issue(self): ['Invalid issue tracker that does not exist.'], error_messages) - @mock.patch('tcms.testcases.models.TestCase.add_issue') + @patch('tcms.testcases.models.TestCase.add_issue') def test_fail_if_case_add_issue_fails(self, add_issue): add_issue.side_effect = Exception('Something wrong') @@ -2437,14 +2436,14 @@ def setUpTestData(cls): cls.case_run_1.notes = 'Some notes' cls.case_run_1.save() - with mock.patch('django.utils.timezone.now') as mock_now: + with patch('django.utils.timezone.now') as mock_now: cls.submit_date = datetime(2020, 1, 22, 19, 47, 30) mock_now.return_value = cls.submit_date add_comment( cls.tester, 'testruns.testcaserun', [cls.case_run_1.pk], 'first comment') - with mock.patch('django.utils.timezone.now') as mock_now: + with patch('django.utils.timezone.now') as mock_now: cls.submit_date_later = cls.submit_date + timedelta(minutes=10) mock_now.return_value = cls.submit_date_later add_comment( diff --git a/src/tests/testplans/test_forms.py b/src/tests/testplans/test_forms.py index e16cb49d..996df0cd 100644 --- a/src/tests/testplans/test_forms.py +++ b/src/tests/testplans/test_forms.py @@ -1,7 +1,7 @@ # -- coding: utf-8 -- import unittest -from mock import Mock +from unittest.mock import Mock from tcms.testplans.forms import UploadedHTMLFile diff --git a/src/tests/testplans/test_models.py b/src/tests/testplans/test_models.py index 7f9e604f..2daec6a7 100644 --- a/src/tests/testplans/test_models.py +++ b/src/tests/testplans/test_models.py @@ -2,7 +2,7 @@ from django.conf import settings from django import test -from mock import patch +from unittest.mock import patch from tcms.testplans.helpers import email from tcms.testplans.models import _disconnect_signals, TestPlan diff --git a/src/tests/testruns/test_views.py b/src/tests/testruns/test_views.py index 48426be7..1a9d7329 100644 --- a/src/tests/testruns/test_views.py +++ b/src/tests/testruns/test_views.py @@ -7,7 +7,7 @@ from http import HTTPStatus from operator import attrgetter -from mock import patch +from unittest.mock import patch from xml.etree import ElementTree from django.db.models import Max diff --git a/src/tests/xmlrpc/test_testcase.py b/src/tests/xmlrpc/test_testcase.py index 7dfe0bfe..e4451228 100644 --- a/src/tests/xmlrpc/test_testcase.py +++ b/src/tests/xmlrpc/test_testcase.py @@ -7,7 +7,7 @@ from django_comments.models import Comment from django.db.models import Max, Min from django import test -from mock import patch, PropertyMock +from unittest.mock import patch, PropertyMock from tcms.core.utils import checksum from tcms.issuetracker.models import Issue diff --git a/src/tests/xmlrpc/test_user.py b/src/tests/xmlrpc/test_user.py index 09d16574..9a7b3332 100644 --- a/src/tests/xmlrpc/test_user.py +++ b/src/tests/xmlrpc/test_user.py @@ -1,6 +1,6 @@ # -- coding: utf-8 -- -from mock import patch +from unittest.mock import patch from django.contrib.auth.models import User from django.test import TestCase
flask-admin__flask-admin-1068	Tests failing due to new Pillow 3.0.0 Tests are currently failing when a tiff file (https://github.com/flask-admin/flask-admin/blob/master/flask_admin/tests/data/copyleft.jpg) is uploaded: ``` ====================================================================== FAIL: flask_admin.tests.test_form_upload.test_image_upload_field ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/travis/virtualenv/python2.6.9/lib/python2.6/site-packages/nose/case.py", line 197, in runTest self.test(*self.arg) File "/home/travis/build/flask-admin/flask-admin/flask_admin/tests/test_form_upload.py", line 225, in test_image_upload_field ok_(my_form.validate()) AssertionError: None >> raise AssertionError(None) ``` The issue has to do with the new 3.0.0 version of Pillow. I started an issue for it here: https://github.com/python-pillow/Pillow/issues/1466 A temporary solution might be to lock Pillow to 2.9.0. I can submit a pull request if that's what we decide to do: https://github.com/flask-admin/flask-admin/compare/master...pawl:fix_pillow_build	[ { "content": "# Fix for older setuptools\nimport re\nimport os\n\nfrom setuptools import setup, find_packages\n\n\ndef fpath(name):\n return os.path.join(os.path.dirname(__file__), name)\n\n\ndef read(fname):\n return open(fpath(fname)).read()\n\n\ndef desc():\n info = read('README.rst')\n try:\n ...	[ { "content": "# Fix for older setuptools\nimport re\nimport os\n\nfrom setuptools import setup, find_packages\n\n\ndef fpath(name):\n return os.path.join(os.path.dirname(__file__), name)\n\n\ndef read(fname):\n return open(fpath(fname)).read()\n\n\ndef desc():\n info = read('README.rst')\n try:\n ...	diff --git a/examples/forms/requirements.txt b/examples/forms/requirements.txt index 1d4552c1d..3c503e3c4 100644 --- a/examples/forms/requirements.txt +++ b/examples/forms/requirements.txt @@ -1,4 +1,4 @@ Flask Flask-Admin Flask-SQLAlchemy -pillow \ No newline at end of file +pillow==2.9.0 diff --git a/requirements-dev.txt b/requirements-dev.txt index 7d96bdb70..a2435b77b 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -5,7 +5,7 @@ peewee wtf-peewee pymongo==2.8 flask-mongoengine -pillow +pillow==2.9.0 Babel<=1.3 flask-babelex shapely==1.5.9 diff --git a/setup.py b/setup.py index d46d6345e..b527c8dde 100644 --- a/setup.py +++ b/setup.py @@ -49,7 +49,7 @@ def grep(attrname): ], tests_require=[ 'nose>=1.0', - 'pillow', + 'pillow==2.9.0', 'mongoengine', 'pymongo', 'wtf-peewee',
google-research__t5x-475	Seg Fault after saving checkpoints Hi, I am getting a seg fault sometimes after the model has saved the checkpoint. It is not every checkpoint and seems to be random which checkpoints it crashes after. I am not sure if it is related to issue #340 For example, I am running `prompt_tuning/scripts/sst2-demo-xxl.sh`, and the output is below. ``` 317 18:14:56.525280 140415323761728 utils.py:138] Saved Numpy Arrays for step 1104000 to gs://nicl/checkpoint_models/sst/full_dataset/prompt-tuning/t5-11b/numpy_checkpoints/checkpoint_1104000 I0317 18:14:56.604028 140415323761728 checkpoints.py:600] Saving checkpoint for step 1104000 to gs://nicl/checkpoint_models/sst/full_dataset/prompt-tuning/t5-11b/checkpoint_1104000.tmp-1647540896 I0317 18:14:56.614308 140622481194048 checkpoints.py:600] Saving checkpoint for step 1104000 to gs://nicl/checkpoint_models/sst/full_dataset/prompt-tuning/t5-11b/checkpoint_1104000.tmp-1647540896 I0317 18:14:56.624289 140590966570048 checkpoints.py:600] Saving checkpoint for step 1104000 to gs://nicl/checkpoint_models/sst/full_dataset/prompt-tuning/t5-11b/checkpoint_1104000.tmp-1647540896 I0317 18:14:56.653718 140272509271104 checkpoints.py:600] Saving checkpoint for step 1104000 to gs://nicl/checkpoint_models/sst/full_dataset/prompt-tuning/t5-11b/checkpoint_1104000.tmp-1647540896 Fatal Python error: Segmentation fault Thread 0x00007fdb1dc01700 (most recent call first): File "/home/dptam/.local/lib/python3.8/site-packages/jax/interpreters/pxla.py", line 664 in _sda_value File "/home/dptam/.local/lib/python3.8/site-packages/jax/_src/device_array.py", line 266 in __array__ File "/home/dptam/.local/lib/python3.8/site-packages/t5x/checkpoints.py", line 447 in <lambda> File "/home/dptam/.local/lib/python3.8/site-packages/t5x/checkpoint_importer.py", line 84 in get File "/usr/lib/python3.8/concurrent/futures/thread.py", line 57 in run File "/usr/lib/python3.8/concurrent/futures/thread.py", line 80 in _worker File "/usr/lib/python3.8/threading.py", line 870 in run File "/usr/lib/python3.8/threading.py", line 932 in _bootstrap_inner File "/usr/lib/python3.8/threading.py", line 890 in _bootstrap Thread 0x00007f56809df700 (most recent call first): File "/usr/lib/python3.8/concurrent/futures/thread.py", line 78 in _worker File "/usr/lib/python3.8/threading.py", line 870 in run File "/usr/lib/python3.8/threading.py", line 932 in _bootstrap_inner File "/usr/lib/python3.8/threading.py", line 890 in _bootstrap Thread 0x00007f56c7aad700 (most recent call first): File "/usr/lib/python3.8/concurrent/futures/thread.py", line 78 in _worker File "/usr/lib/python3.8/threading.py", line 870 in run File "/usr/lib/python3.8/threading.py", line 932 in _bootstrap_inner File "/usr/lib/python3.8/threading.py", line 890 in _bootstrap Thread 0x00007fdde29efc40 (most recent call first): File "/home/dptam/.local/lib/python3.8/site-packages/t5x/checkpoints.py", line 693 in _write_array https://symbolize.stripped_domain/r/?trace=7fdde2e4203b,7fdde2e420bf,e,5ef27540f,e,26f7c5aff,f,b15f59df&map= E0317 18:14:57.770066 341059 process_state.cc:1062] RAW: Signal 11 raised at PC: 0x7fdde2e4203b while already in FailureSignalHandler! E0317 18:14:57.770096 341059 process_state.cc:1065] RAW: tid: 341059 raised new signal @ 0xf 1440 (unknown) @ 0x25ed159b0 (unknown) (unknown) @ 0x10 76231216 (unknown) @ 0x261cdc840 (unknown) (unknown) @ 0x2dfdd4780 (unknown) (unknown) @ 0x5f1f8a120 (unknown) (unknown) https://symbolize.stripped_domain/r/?trace=7fdde301ffd3,7fddd98d57f9,7fdde2e420bf,7,e,25ed159af,f,261cdc83f,2dfdd477f,5f1f8a11f&map=7a511a57244151c993b16b37978e7ed7:7fddcaefd000-7fddd9c3fd50 E0317 18:14:57.818885 341068 coredump_hook.cc:365] RAW: Remote crash data gathering hook invoked. E0317 18:14:57.818900 341068 coredump_hook.cc:411] RAW: Skipping coredump since rlimit was 0 at process start. E0317 18:14:57.818919 341068 client.cc:221] RAW: Coroner client retries enabled (b/136286901), will retry for up to 30 sec. E0317 18:14:57.818922 341068 coredump_hook.cc:473] RAW: Sending fingerprint to remote end. E0317 18:14:57.818928 341068 coredump_socket.cc:124] RAW: Stat failed errno=2 on socket /var/google/services/logmanagerd/remote_coredump.socket E0317 18:14:57.818933 341068 coredump_hook.cc:477] RAW: Cannot send fingerprint to Coroner: [NOT_FOUND] Missing crash reporting socket. Is the listener running? E0317 18:14:57.818938 341068 coredump_hook.cc:550] RAW: Discarding core. prompt_tuning/scripts/sst2-demo-xxl.sh: line 37: 337643 Segmentation fault (core dumped) python3 -m t5x.train --gin_search_paths="${T5X_DIR},${FLAXFORMER_DIR},${PROMPT_DIR}" --gin_file="prompt_tuning/configs/models/t5_1_1_xxl_prompt.gin" --gin_file="prompt_tuning/configs/prompts/from_class_labels.gin" --gin_file="prompt_tuning/configs/runs/prompt_finetune.gin" --gin.CLASS_LABELS="['positive', 'negative']" --gin.MODEL_DIR="'${MODEL_DIR}'" --gin.MIXTURE_OR_TASK_NAME="'taskless_glue_sst2_v200_examples'" --gin.MIXTURE_OR_TASK_MODULE="'prompt_tuning.data.glue'" --gin.TASK_FEATURE_LENGTHS="{'inputs': 512, 'targets': 8}" --gin.INITIAL_CHECKPOINT_PATH="'${PRETRAINED_MODEL}'" --gin.TRAIN_STEPS="1_212_000" --gin.USE_CACHED_TASKS="False" --gin.BATCH_SIZE="16" --gin.partitioning.PjitPartitioner.model_parallel_submesh="(4, 4, 1, 2)" --tfds_data_dir=${TFDS_DATA_DIR} ##### Command execution on worker 3 failed with return code 139. Continuing. prompt_tuning/scripts/sst2-demo-xxl.sh: line 37: 334750 Aborted (core dumped) python3 -m t5x.train --gin_search_paths="${T5X_DIR},${FLAXFORMER_DIR},${PROMPT_DIR}" --gin_file="prompt_tuning/configs/models/t5_1_1_xxl_prompt.gin" --gin_file="prompt_tuning/configs/prompts/from_class_labels.gin" --gin_file="prompt_tuning/configs/runs/prompt_finetune.gin" --gin.CLASS_LABELS="['positive', 'negative']" --gin.MODEL_DIR="'${MODEL_DIR}'" --gin.MIXTURE_OR_TASK_NAME="'taskless_glue_sst2_v200_examples'" --gin.MIXTURE_OR_TASK_MODULE="'prompt_tuning.data.glue'" --gin.TASK_FEATURE_LENGTHS="{'inputs': 512, 'targets': 8}" --gin.INITIAL_CHECKPOINT_PATH="'${PRETRAINED_MODEL}'" --gin.TRAIN_STEPS="1_212_000" --gin.USE_CACHED_TASKS="False" --gin.BATCH_SIZE="16" --gin.partitioning.PjitPartitioner.model_parallel_submesh="(4, 4, 1, 2)" --tfds_data_dir=${TFDS_DATA_DIR} ##### Command execution on worker 1 failed with return code 134. Continuing. prompt_tuning/scripts/sst2-demo-xxl.sh: line 37: 335504 Aborted (core dumped) python3 -m t5x.train --gin_search_paths="${T5X_DIR},${FLAXFORMER_DIR},${PROMPT_DIR}" --gin_file="prompt_tuning/configs/models/t5_1_1_xxl_prompt.gin" --gin_file="prompt_tuning/configs/prompts/from_class_labels.gin" --gin_file="prompt_tuning/configs/runs/prompt_finetune.gin" --gin.CLASS_LABELS="['positive', 'negative']" --gin.MODEL_DIR="'${MODEL_DIR}'" --gin.MIXTURE_OR_TASK_NAME="'taskless_glue_sst2_v200_examples'" --gin.MIXTURE_OR_TASK_MODULE="'prompt_tuning.data.glue'" --gin.TASK_FEATURE_LENGTHS="{'inputs': 512, 'targets': 8}" --gin.INITIAL_CHECKPOINT_PATH="'${PRETRAINED_MODEL}'" --gin.TRAIN_STEPS="1_212_000" --gin.USE_CACHED_TASKS="False" --gin.BATCH_SIZE="16" --gin.partitioning.PjitPartitioner.model_parallel_submesh="(4, 4, 1, 2)" --tfds_data_dir=${TFDS_DATA_DIR} ##### Command execution on worker 0 failed with return code 134. Continuing. ``` Thanks	[ { "content": "# Copyright 2022 The T5X Authors.\n#\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by app...	[ { "content": "# Copyright 2022 The T5X Authors.\n#\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by app...	diff --git a/setup.py b/setup.py index d9dbe74ea..02f838b6a 100644 --- a/setup.py +++ b/setup.py @@ -58,7 +58,7 @@ 'seqio-nightly', 't5', 'tensorflow', - 'tensorstore', + 'tensorstore >= 0.1.20', ], extras_require={ 'gcp': [
pallets__werkzeug-2320	ProxyMiddleware encodes characters allowed in path We have a dollar sign in URL and proxy middleware converts it to `%24`. Unfortunately, for backend server url with `$` and url with `%24` are two different urls. It could be fixed by extending safe characters in middleware as it done in [url_fix](https://github.com/pallets/werkzeug/blob/9efe8c00dcb2b6fc086961ba304729db01912652/src/werkzeug/urls.py#L691) function, but it seems to me that the right way is to make the middleware to use `REQUEST_URI`/`RAW_URI` when possible. This way also can fix middleware for cases like the one described in https://github.com/pallets/werkzeug/issues/766. I can send PR, but since it will require some efforts on making `remove_prefix` option working correctly and to ensure backward compatibility for public method `proxy_to`, I'd like to discuss this solution first. If it can be accepted, then I proceed.	[ { "content": "\"\"\"Functions for working with URLs.\n\nContains implementations of functions from :mod:`urllib.parse` that\nhandle bytes and strings.\n\"\"\"\nimport codecs\nimport os\nimport re\nimport typing as t\n\nfrom ._internal import _check_str_tuple\nfrom ._internal import _decode_idna\nfrom ._internal...	[ { "content": "\"\"\"Functions for working with URLs.\n\nContains implementations of functions from :mod:`urllib.parse` that\nhandle bytes and strings.\n\"\"\"\nimport codecs\nimport os\nimport re\nimport typing as t\n\nfrom ._internal import _check_str_tuple\nfrom ._internal import _decode_idna\nfrom ._internal...	diff --git a/CHANGES.rst b/CHANGES.rst index 88bee32ea..661c3d38a 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -63,6 +63,8 @@ Unreleased a list, to custom URL converters. :issue:`2249` - ``run_simple`` shows instructions for dealing with "address already in use" errors, including extra instructions for macOS. :pr:`2321` +- Extend list of characters considered always safe in URLs based on + :rfc:`3986`. :issue:`2319` Version 2.0.3 diff --git a/src/werkzeug/urls.py b/src/werkzeug/urls.py index 1cb9418d2..67c08b0bc 100644 --- a/src/werkzeug/urls.py +++ b/src/werkzeug/urls.py @@ -27,6 +27,7 @@ b"ABCDEFGHIJKLMNOPQRSTUVWXYZ" b"0123456789" b"-._~" + b"$!'()*+,;" # RFC3986 sub-delims set, not including query string delimiters &= ) ) diff --git a/tests/middleware/test_http_proxy.py b/tests/middleware/test_http_proxy.py index b39cd3517..2b3bc55bf 100644 --- a/tests/middleware/test_http_proxy.py +++ b/tests/middleware/test_http_proxy.py @@ -45,3 +45,7 @@ def test_http_proxy(standard_app): assert "HTTP_X_SPECIAL" not in r.json assert r.json["HTTP_HOST"] == "127.0.0.1" assert r.json["PATH_INFO"] == "/autohost/aha" + + # test if characters allowed in URL are not encoded by proxy + r = client.get("/autohost/$") + assert r.json["REQUEST_URI"] == "/autohost/$"
wright-group__WrightTools-640	CITATION text file not distributed	[ { "content": "#! /usr/bin/env python3\n\nimport os\nfrom setuptools import setup, find_packages\n\n\nhere = os.path.abspath(os.path.dirname(__file__))\n\n\ndef read(fname):\n return open(os.path.join(here, fname)).read()\n\n\nextra_files = {\n \"WrightTools\": [\n \"datasets\",\n \"datasets/...	[ { "content": "#! /usr/bin/env python3\n\nimport os\nfrom setuptools import setup, find_packages\n\n\nhere = os.path.abspath(os.path.dirname(__file__))\n\n\ndef read(fname):\n return open(os.path.join(here, fname)).read()\n\n\nextra_files = {\n \"WrightTools\": [\n \"datasets\",\n \"datasets/...	diff --git a/setup.py b/setup.py index d79eb6dfa..fa23eb776 100755 --- a/setup.py +++ b/setup.py @@ -18,6 +18,7 @@ def read(fname): "datasets//", "datasets///", "datasets////*", + "CITATION", "VERSION", "WT5_VERSION", ]
typeddjango__django-stubs-1782	Make mypy a soft dependency Given that there are several popular alternatives to mypy (e.g. pyright and pytype), mypy should be an optional dependency, installable with e.g. `django-stubs[mypy]`. I haven't tested it myself yet, but if `django-stubs` doesn't work with these "alternative" typecheckers, then I'd suggest that it should explicitly mentioned that this is a mypy-only stubs package.	[ { "content": "#!/usr/bin/env python\nimport os\nfrom typing import List\n\nfrom setuptools import find_packages, setup\n\n\ndef find_stub_files(name: str) -> List[str]:\n result = []\n for root, _dirs, files in os.walk(name):\n for file in files:\n if file.endswith(\".pyi\"):\n ...	[ { "content": "#!/usr/bin/env python\nimport os\nfrom typing import List\n\nfrom setuptools import find_packages, setup\n\n\ndef find_stub_files(name: str) -> List[str]:\n result = []\n for root, _dirs, files in os.walk(name):\n for file in files:\n if file.endswith(\".pyi\"):\n ...	diff --git a/setup.py b/setup.py index b5067b3fe..5973d2e63 100644 --- a/setup.py +++ b/setup.py @@ -21,7 +21,6 @@ def find_stub_files(name: str) -> List[str]: readme = f.read() dependencies = [ - "mypy>=1.0.0", "django", "django-stubs-ext>=4.2.5", "tomli; python_version < '3.11'",
optuna__optuna-4965	Use `__future__.annotations` everywhere in the Optuna code base ### Motivation Optuna drops Python 3.6 from v3.1, so we can use `__future__.annotations`, which simplifies the code base. See [PEP 563](https://peps.python.org/pep-0563/), [PEP584](https://peps.python.org/pep-0584/), [PEP 585](https://peps.python.org/pep-0585/), and [PEP 604](https://peps.python.org/pep-0604/) for more details. This issue suggests to use the module and simplifies the code base. ### Suggestion Use `__future__.annotations` for each file and simplify the type annotations. The list of classes whose type annotations can be simplified is [here](https://peps.python.org/pep-0585/#implementation). The list of files where the `__future__.annotations` can be used is as follows. In order to reduce review costs and to encourage more contributors to work on it, please, as a rule, fix one file per PR. - [x] optuna/_convert_positional_args.py - [x] optuna/visualization/_optimization_history.py - [x] optuna/visualization/_hypervolume_history.py - [x] optuna/visualization/_edf.py - [x] optuna/visualization/_pareto_front.py - [x] optuna/visualization/matplotlib/_optimization_history.py - [x] optuna/visualization/matplotlib/_hypervolume_history.py - [x] optuna/visualization/matplotlib/_edf.py - [x] optuna/visualization/matplotlib/_pareto_front.py - [x] optuna/visualization/matplotlib/_contour.py - [x] optuna/visualization/_utils.py - [x] optuna/logging.py - [ ] optuna/storages/_base.py - [ ] optuna/storages/_cached_storage.py - [ ] optuna/storages/__init__.py - [ ] optuna/storages/_heartbeat.py - [ ] optuna/storages/_in_memory.py - [ ] optuna/storages/_rdb/models.py - [ ] optuna/storages/_rdb/storage.py - [ ] optuna/storages/_rdb/alembic/versions/v3.0.0.c.py - [ ] optuna/storages/_rdb/alembic/versions/v3.0.0.d.py - [ ] optuna/storages/_rdb/alembic/versions/v3.0.0.a.py - [ ] optuna/storages/_journal/file.py - [ ] optuna/storages/_journal/redis.py - [ ] optuna/storages/_journal/storage.py - [ ] optuna/storages/_journal/base.py - [ ] optuna/study/_dataframe.py - [ ] optuna/study/_optimize.py - [ ] optuna/study/_tell.py - [ ] optuna/study/_multi_objective.py - [ ] optuna/study/_frozen.py - [ ] optuna/study/study.py - [ ] optuna/study/_study_summary.py - [ ] optuna/search_space/group_decomposed.py - [ ] optuna/search_space/intersection.py - [ ] optuna/_typing.py - [ ] optuna/_deprecated.py - [ ] optuna/pruners/_hyperband.py - [ ] optuna/pruners/_patient.py - [ ] optuna/pruners/_successive_halving.py - [ ] optuna/pruners/_percentile.py - [ ] optuna/pruners/_threshold.py - [ ] optuna/trial/_base.py - [ ] optuna/trial/_fixed.py - [ ] optuna/trial/_trial.py - [ ] optuna/trial/_frozen.py - [ ] optuna/integration/cma.py - [ ] optuna/integration/shap.py - [ ] optuna/integration/lightgbm.py - [ ] optuna/integration/pytorch_distributed.py - [ ] optuna/integration/_lightgbm_tuner/optimize.py - [ ] optuna/integration/_lightgbm_tuner/alias.py - [ ] optuna/integration/mlflow.py - [ ] optuna/integration/wandb.py - [ ] optuna/integration/catboost.py - [ ] optuna/integration/skopt.py - [ ] optuna/integration/botorch.py - [ ] optuna/integration/dask.py - [x] optuna/integration/sklearn.py - [ ] optuna/integration/tensorboard.py - [ ] optuna/terminator/callback.py - [ ] optuna/terminator/terminator.py - [ ] optuna/terminator/improvement/_preprocessing.py - [ ] optuna/terminator/improvement/gp/botorch.py - [ ] optuna/terminator/improvement/gp/base.py - [ ] optuna/terminator/improvement/evaluator.py - [ ] optuna/importance/_base.py - [ ] optuna/importance/_mean_decrease_impurity.py - [ ] optuna/importance/__init__.py - [ ] optuna/importance/_fanova/_fanova.py - [ ] optuna/importance/_fanova/_evaluator.py - [ ] optuna/importance/_fanova/_tree.py - [ ] optuna/_imports.py - [ ] optuna/testing/tempfile_pool.py - [ ] optuna/testing/threading.py - [ ] optuna/testing/distributions.py - [ ] optuna/testing/samplers.py - [ ] optuna/testing/storages.py - [ ] optuna/distributions.py - [ ] optuna/cli.py - [ ] optuna/multi_objective/visualization/_pareto_front.py - [ ] optuna/multi_objective/trial.py - [ ] optuna/multi_objective/samplers/_base.py - [ ] optuna/multi_objective/samplers/_nsga2.py - [ ] optuna/multi_objective/samplers/_adapter.py - [ ] optuna/multi_objective/samplers/_random.py - [ ] optuna/multi_objective/samplers/_motpe.py - [ ] optuna/multi_objective/study.py - [ ] optuna/_experimental.py - [ ] optuna/samplers/_base.py - [ ] optuna/samplers/nsgaii/_crossovers/_undx.py - [ ] optuna/samplers/nsgaii/_crossovers/_spx.py - [ ] optuna/samplers/nsgaii/_crossovers/_sbx.py - [ ] optuna/samplers/nsgaii/_crossovers/_vsbx.py - [ ] optuna/samplers/nsgaii/_sampler.py - [ ] optuna/samplers/nsgaii/_crossover.py - [ ] optuna/samplers/_search_space/intersection.py - [ ] optuna/samplers/_qmc.py - [ ] optuna/samplers/_tpe/probability_distributions.py - [ ] optuna/samplers/_tpe/_truncnorm.py - [ ] optuna/samplers/_tpe/multi_objective_sampler.py - [ ] optuna/samplers/_tpe/parzen_estimator.py - [ ] optuna/samplers/_tpe/sampler.py - [ ] optuna/samplers/_random.py - [ ] optuna/samplers/_cmaes.py - [ ] optuna/samplers/_partial_fixed.py - [ ] optuna/samplers/_brute_force.py - [ ] optuna/samplers/_nsgaiii.py - [ ] optuna/samplers/_grid.py - [ ] optuna/_hypervolume/wfg.py - [ ] optuna/_hypervolume/hssp.py - [ ] optuna/progress_bar.py - [ ] optuna/_transform.py - [ ] optuna/_callbacks.py - [ ] tests/multi_objective_tests/test_study.py - [ ] tests/multi_objective_tests/samplers_tests/test_motpe.py - [ ] tests/multi_objective_tests/samplers_tests/test_nsga2.py - [ ] tests/multi_objective_tests/test_trial.py - [ ] tests/multi_objective_tests/visualization_tests/test_pareto_front.py - [ ] tests/trial_tests/test_frozen.py - [ ] tests/trial_tests/test_trials.py - [ ] tests/trial_tests/test_trial.py - [ ] tests/pruners_tests/test_percentile.py - [ ] tests/pruners_tests/test_median.py - [ ] tests/pruners_tests/test_patient.py - [ ] tests/pruners_tests/test_successive_halving.py - [ ] tests/study_tests/test_optimize.py - [ ] tests/study_tests/test_study.py - [ ] tests/hypervolume_tests/test_hssp.py - [x] tests/integration_tests/test_skopt.py - [x] tests/integration_tests/test_pytorch_lightning.py - [ ] tests/integration_tests/test_shap.py - [ ] tests/integration_tests/test_cma.py - [ ] tests/integration_tests/test_pytorch_distributed.py - [ ] tests/integration_tests/lightgbm_tuner_tests/test_optimize.py - [ ] tests/integration_tests/lightgbm_tuner_tests/test_alias.py - [ ] tests/integration_tests/test_botorch.py - [ ] tests/integration_tests/test_mlflow.py - [ ] tests/integration_tests/test_mxnet.py - [ ] tests/integration_tests/test_wandb.py - [ ] tests/importance_tests/fanova_tests/test_tree.py - [ ] tests/importance_tests/test_mean_decrease_impurity.py - [ ] tests/importance_tests/test_fanova.py - [ ] tests/importance_tests/test_init.py - [ ] tests/test_convert_positional_args.py - [ ] tests/test_deprecated.py - [ ] tests/storages_tests/test_journal.py - [ ] tests/storages_tests/test_heartbeat.py - [ ] tests/storages_tests/test_storages.py - [ ] tests/storages_tests/rdb_tests/test_storage.py - [ ] tests/storages_tests/rdb_tests/create_db.py - [ ] tests/storages_tests/test_with_server.py - [ ] tests/samplers_tests/test_grid.py - [ ] tests/samplers_tests/tpe_tests/test_parzen_estimator.py - [ ] tests/samplers_tests/tpe_tests/test_multi_objective_sampler.py - [ ] tests/samplers_tests/tpe_tests/test_sampler.py - [ ] tests/samplers_tests/test_cmaes.py - [ ] tests/samplers_tests/test_samplers.py - [x] tests/samplers_tests/test_nsgaii.py - [x] tests/samplers_tests/test_nsgaiii.py - [ ] tests/samplers_tests/test_qmc.py - [ ] tests/test_distributions.py - [ ] tests/test_multi_objective.py - [ ] tests/test_cli.py - [ ] tests/visualization_tests/test_hypervolume_history.py - [ ] tests/visualization_tests/test_pareto_front.py - [ ] tests/terminator_tests/improvement_tests/test_evaluator.py - [ ] benchmarks/kurobako/problems/wfg/transformation_functions.py - [ ] benchmarks/bayesmark/report_bayesmark.py - [ ] benchmarks/bayesmark/optuna_optimizer.py ### Additional context (optional) The above list is generated by the following script. <details> <summary>script</summary> ```python import os import pathlib PATTERS = [ "from typing import Union", "from typing import Optional", "from typing import Tuple", "from typing import List", "from typing import Dict", "from typing import Set", "from typing import FrozenSet", "from typing import Type", "from typing import FrozenSet", "from typing import Sequence", ] def get_filenames_to_be_simplified(dir_path): ret = [] for f in os.listdir(dir_path): file_path = os.path.join(dir_path, f) if not os.path.isfile(file_path): ret.extend(get_filenames_to_be_simplified(file_path)) else: try: with open(file_path) as fd: contents = fd.read() if any([s in contents for s in PATTERS]): ret.append(str(file_path)) except UnicodeDecodeError as e: pass return ret def main(): dirs = ["optuna", "tests", "benchmarks"] for dir_name in dirs: filenames = get_filenames_to_be_simplified(pathlib.Path(dir_name)) for filename in filenames: print(f"- [ ] {filename}") if __name__ == "__main__": main() ``` </details>	[ { "content": "from __future__ import annotations\n\nfrom typing import NamedTuple\nfrom typing import Sequence\n\nimport numpy as np\n\nfrom optuna._experimental import experimental_func\nfrom optuna._hypervolume import WFG\nfrom optuna.logging import get_logger\nfrom optuna.samplers._base import _CONSTRAINTS_K...	[ { "content": "from __future__ import annotations\n\nfrom collections.abc import Sequence\nfrom typing import NamedTuple\n\nimport numpy as np\n\nfrom optuna._experimental import experimental_func\nfrom optuna._hypervolume import WFG\nfrom optuna.logging import get_logger\nfrom optuna.samplers._base import _CONS...	diff --git a/optuna/visualization/_hypervolume_history.py b/optuna/visualization/_hypervolume_history.py index c1fff4b877..39e6c23e53 100644 --- a/optuna/visualization/_hypervolume_history.py +++ b/optuna/visualization/_hypervolume_history.py @@ -1,7 +1,7 @@ from __future__ import annotations +from collections.abc import Sequence from typing import NamedTuple -from typing import Sequence import numpy as np
ansible__ansible-modules-core-3859	Bug in regex checker for azure_rm_virtualnetwork ##### ISSUE TYPE - Feature Idea ##### COMPONENT NAME azure_rm_virtualnetwork ##### ANSIBLE VERSION 2.2.0 ##### CONFIGURATION N/A ##### OS / ENVIRONMENT Ubuntu 14.04 ##### SUMMARY azure_rm_virtualnetwork contains code to check for the validity of the "name" parameter (https://github.com/ansible/ansible-modules-core/blob/devel/cloud/azure/azure_rm_virtualnetwork.py#L148). That regex does not take into account that the "." character is valid, as long as it's neither at the start or end of the name string. ##### STEPS TO REPRODUCE ``` - name: Create virtual network azure_rm_virtualnetwork: name: My.Sweet.Network ``` ##### EXPECTED RESULTS The network should get created, since it has a valid name ##### ACTUAL RESULTS msg": "Parameter error: name must begin with a letter or number, end with a letter, number or underscore and may contain only letters, numbers, periods, underscores or hyphens."}	[ { "content": "#!/usr/bin/python\n#\n# Copyright (c) 2016 Matt Davis, <mdavis@ansible.com>\n# Chris Houseknecht, <house@redhat.com>\n#\n# This file is part of Ansible\n#\n# Ansible is free software: you can redistribute it and/or modify\n# it under the terms of the GNU General Public License a...	[ { "content": "#!/usr/bin/python\n#\n# Copyright (c) 2016 Matt Davis, <mdavis@ansible.com>\n# Chris Houseknecht, <house@redhat.com>\n#\n# This file is part of Ansible\n#\n# Ansible is free software: you can redistribute it and/or modify\n# it under the terms of the GNU General Public License a...	diff --git a/cloud/azure/azure_rm_virtualnetwork.py b/cloud/azure/azure_rm_virtualnetwork.py index 9f1e7e61f23..d7bbdd00d85 100644 --- a/cloud/azure/azure_rm_virtualnetwork.py +++ b/cloud/azure/azure_rm_virtualnetwork.py @@ -145,7 +145,7 @@ pass -NAME_PATTERN = re.compile(r"^[a-zA-Z0-9_]{1,61}[a-z0-9_]$") +NAME_PATTERN = re.compile(r"^[a-zA-Z0-9]+[a-zA-Z0-9\._-]+[a-zA-Z0-9_]+$") def virtual_network_to_dict(vnet):
optuna__optuna-1882	Remove the document for `with_traceback` method of Optuna's exception classes Currently, Optuna's exception classes have the documentations of `with_traceback` method, which is inherited from `Exception`. I don't think it is informative for readers and it can be removed from the reference. ![image](https://user-images.githubusercontent.com/3255979/89862021-0a4afd80-dbe2-11ea-8f86-626d960b4255.png) The following `Exception` has the `with_traceback` method. - [ ] `optuna.exceptions.CLIUsageError` - [ ] `optuna.exceptions.OptunaError` - [ ] `optuna.exceptions.TrialPruned` - [ ] `optuna.exceptions.CLIUsageError` - [ ] `optuna.exceptions.StorageInternalError` - [ ] `optuna.exceptions.DuplicatedStudyError` CC @keisuke-umezawa Please let me know if you have any comments.	[ { "content": "# -- coding: utf-8 --\n#\n# Configuration file for the Sphinx documentation builder.\n#\n# This file does only contain a selection of the most common options. For a\n# full list see the documentation:\n# http://www.sphinx-doc.org/en/master/config\n\n# -- Path setup ------------------------------...	[ { "content": "# -- coding: utf-8 --\n#\n# Configuration file for the Sphinx documentation builder.\n#\n# This file does only contain a selection of the most common options. For a\n# full list see the documentation:\n# http://www.sphinx-doc.org/en/master/config\n\n# -- Path setup ------------------------------...	diff --git a/docs/source/conf.py b/docs/source/conf.py index 16d954afae..05540085a2 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -172,6 +172,7 @@ autodoc_default_options = { 'members': True, 'inherited-members': True, + 'exclude-members': 'with_traceback', } sphinx_gallery_conf = {
bokeh__bokeh-1948	`publishing` example from the `embed` directory fails With an error message that is not particularly helpfull. Using bokeh 0.8. ``` ➜ embed python publishing.py Using saved session configuration for http://localhost:5006/ To override, pass 'load_from_config=False' to Session INFO:requests.packages.urllib3.connectionpool:Starting new HTTP connection (1): localhost Traceback (most recent call last): File "publishing.py", line 11, in <module> Session().register('testuser', 'testpassword') File "/Users/nicolas/anaconda/lib/python2.7/site-packages/bokeh/session.py", line 208, in register raise RuntimeError("Unknown Error") RuntimeError: Unknown Error ```	[ { "content": "# The plot server must be running\n# Go to http://localhost:5006/bokeh to view this plot\n\nimport time\n\nimport numpy as np\n\nfrom bokeh.plotting import \nfrom bokeh.session import Session\nfrom bokeh import embed\nSession().register('testuser', 'testpassword')\nN = 80\nx = np.linspace(0, 4np...	[ { "content": "# The plot server must be running\n# The server must run with --multi-user for this example to work\n# Go to http://localhost:5006/bokeh to view this plot\n\nimport time\n\nimport numpy as np\n\nfrom bokeh.plotting import *\nfrom bokeh.session import Session\nfrom bokeh import embed\nSession().reg...	diff --git a/examples/embed/README.md b/examples/embed/README.md index f4e77c448c9..9b98f24661e 100644 --- a/examples/embed/README.md +++ b/examples/embed/README.md @@ -2,7 +2,11 @@ To try these example you first have to start the bokeh-server, ie., bokeh-server --backend=memory -and then run the examples: +Some examples (e.g. publishing) need the server to run in multi-user mode: + + bokeh-server -m --backend=memory + +Then run the examples: python widget.py @@ -10,6 +14,7 @@ or python animated.py + To view them, start a web server in this directory, for instance, the server built into python: diff --git a/examples/embed/publishing.py b/examples/embed/publishing.py index a099eda61ea..d0dcd17888b 100644 --- a/examples/embed/publishing.py +++ b/examples/embed/publishing.py @@ -1,4 +1,5 @@ # The plot server must be running +# The server must run with --multi-user for this example to work # Go to http://localhost:5006/bokeh to view this plot import time
mozilla__bugbug-3941	[model:accessibility] Add the model to `http_service` and `data_pipeline` Depends on merging: #3775	[ { "content": "# -- coding: utf-8 --\n# This Source Code Form is subject to the terms of the Mozilla Public\n# License, v. 2.0. If a copy of the MPL was not distributed with this file,\n# You can obtain one at http://mozilla.org/MPL/2.0/.\n\nimport logging\nimport os\nfrom datetime import timedelta\nfrom funct...	[ { "content": "# -- coding: utf-8 --\n# This Source Code Form is subject to the terms of the Mozilla Public\n# License, v. 2.0. If a copy of the MPL was not distributed with this file,\n# You can obtain one at http://mozilla.org/MPL/2.0/.\n\nimport logging\nimport os\nfrom datetime import timedelta\nfrom funct...	diff --git a/http_service/bugbug_http/models.py b/http_service/bugbug_http/models.py index 6fb1247b65..3615050925 100644 --- a/http_service/bugbug_http/models.py +++ b/http_service/bugbug_http/models.py @@ -34,6 +34,7 @@ "spambug", "testlabelselect", "testgroupselect", + "accessibility", ] DEFAULT_EXPIRATION_TTL = 7 * 24 * 3600 # A week diff --git a/infra/data-pipeline.yml b/infra/data-pipeline.yml index b1160932bb..c0ad93b0c6 100644 --- a/infra/data-pipeline.yml +++ b/infra/data-pipeline.yml @@ -1003,6 +1003,44 @@ tasks: owner: release-mgmt-analysis@mozilla.com source: ${repository}/raw/master/data-pipeline.yml + - ID: train-accessibility + created: { $fromNow: "" } + deadline: { $fromNow: "3 days" } + expires: { $fromNow: "1 year" } + provisionerId: proj-bugbug + workerType: compute-smaller + dependencies: + - bugs-retrieval + payload: + maxRunTime: 25200 + image: mozilla/bugbug-base:${version} + command: + - bugbug-train + - accessibility + + artifacts: + public/accessibilitymodel.tar.zst: + expires: { $fromNow: "1 month" } + path: /accessibilitymodel.tar.zst + type: file + public/metrics.json: + expires: { $fromNow: "1 year" } + path: /metrics.json + type: file + + routes: + - notify.email.release-mgmt-analysis@mozilla.com.on-failed + - notify.irc-channel.#bugbug.on-failed + - index.project.bugbug.train_accessibility.${version} + - index.project.bugbug.train_accessibility.per_version.${version}.${year}.${month}.${day}.${hour}.${minute}.${second} + - index.project.bugbug.train_accessibility.per_date.${year}.${month}.${day}.${hour}.${minute}.${second}.${version} + - index.project.bugbug.train_accessibility.latest + metadata: + name: bugbug train accessibility model + description: bugbug train accessibility model + owner: release-mgmt-analysis@mozilla.com + source: ${repository}/raw/master/data-pipeline.yml + - ID: train-test-label-select created: { $fromNow: "" } deadline: { $fromNow: "5 days" } @@ -1215,6 +1253,7 @@ tasks: - train-test-group-select - train-test-failure - train-needsdiagnosis + - train-accessibility payload: maxRunTime: 3600 image: mozilla/bugbug-base:${version} @@ -1250,6 +1289,7 @@ tasks: - train-test-label-select - train-test-group-select - train-needsdiagnosis + - train-accessibility payload: capabilities: privileged: true
getmoto__moto-698	Unable to create a key with a trailing slash using OrdinaryCallingFormat When using OrdinaryCallingFormat, it's not possible to create a key ending with a slash (e.g. when mimicking directory creation), since this is stripped off when parsing the key name. I can't comment on S3, but this is at least different behaviour from Ceph. For example, the below fails as is, but works if the connection uses SubdomainCallingFormat instead. ``` import boto import moto import unittest class TestCreatingKeyEndingWithSlash(unittest.TestCase): @moto.mock_s3 def test_ordinary_calling_format(self): bucket_name = 'testbucket' key_name = 'key_ending_with_slash/' conn = boto.connect_s3('access_key', 'secret_key', calling_format=boto.s3.connection.OrdinaryCallingFormat()) bucket = conn.create_bucket(bucket_name) key = boto.s3.key.Key(bucket) key.key = key_name key.set_contents_from_string('') self.assertIn(key_name, [k.name for k in bucket.get_all_keys()]) ```	[ { "content": "from __future__ import unicode_literals\nfrom six.moves.urllib.parse import urlparse\n\n\ndef bucket_name_from_url(url):\n pth = urlparse(url).path.lstrip(\"/\")\n\n l = pth.lstrip(\"/\").split(\"/\")\n if len(l) == 0 or l[0] == \"\":\n return None\n return l[0]\n\n\ndef parse_k...	[ { "content": "from __future__ import unicode_literals\nfrom six.moves.urllib.parse import urlparse\n\n\ndef bucket_name_from_url(url):\n pth = urlparse(url).path.lstrip(\"/\")\n\n l = pth.lstrip(\"/\").split(\"/\")\n if len(l) == 0 or l[0] == \"\":\n return None\n return l[0]\n\n\ndef parse_k...	diff --git a/moto/s3bucket_path/utils.py b/moto/s3bucket_path/utils.py index aa7dc12f0961..e10e64fb6492 100644 --- a/moto/s3bucket_path/utils.py +++ b/moto/s3bucket_path/utils.py @@ -12,7 +12,7 @@ def bucket_name_from_url(url): def parse_key_name(path): - return "/".join(path.rstrip("/").split("/")[2:]) + return "/".join(path.split("/")[2:]) def is_delete_keys(request, path, bucket_name): diff --git a/tests/test_s3/test_s3.py b/tests/test_s3/test_s3.py index 95a755ab13d5..5519f0c5759a 100644 --- a/tests/test_s3/test_s3.py +++ b/tests/test_s3/test_s3.py @@ -1076,3 +1076,20 @@ def test_website_configuration_xml(): bucket = conn.create_bucket('test-bucket') bucket.set_website_configuration_xml(TEST_XML) bucket.get_website_configuration_xml().should.equal(TEST_XML) + + +@mock_s3 +def test_key_with_trailing_slash_in_ordinary_calling_format(): + conn = boto.connect_s3( + 'access_key', + 'secret_key', + calling_format=boto.s3.connection.OrdinaryCallingFormat() + ) + bucket = conn.create_bucket('test_bucket_name') + + key_name = 'key_with_slash/' + + key = Key(bucket, key_name) + key.set_contents_from_string('some value') + + [k.name for k in bucket.get_all_keys()].should.contain(key_name)
pyca__cryptography-7106	adding custom attribute that have octetstring parameter looks like I still can't put an octetstring attribute even if I used _tag in addattribute function that will be added in version 37 because _ASN1Type doesn't have octetstring(tag 04) in it. (PS: why it needs some whitelist for allowed tag types?) attribute I wanted to add: https://cabforum.org/wp-content/uploads/CA-Browser-Forum-BR-1.8.2.pdf appendix B, 2-b cabf OBJECT IDENTIFIER ::= { joint-iso-itu-t(2) international-organizations(23) ca-browser-forum(140) } caSigningNonce ATTRIBUTE ::= { WITH SYNTAX OCTET STRING EQUALITY MATCHING RULE octetStringMatch SINGLE VALUE TRUE ID { cabf-caSigningNonce } } cabf-caSigningNonce OBJECT IDENTIFIER ::= { cabf 41 } https://github.com/pyca/cryptography/pull/7038 tested locally by editing name.py, rust part of code doesn't complain.	[ { "content": "# This file is dual licensed under the terms of the Apache License, Version\n# 2.0, and the BSD License. See the LICENSE file in the root of this repository\n# for complete details.\n\nimport binascii\nimport re\nimport sys\nimport typing\nimport warnings\n\nfrom cryptography import utils\nfrom cr...	[ { "content": "# This file is dual licensed under the terms of the Apache License, Version\n# 2.0, and the BSD License. See the LICENSE file in the root of this repository\n# for complete details.\n\nimport binascii\nimport re\nimport sys\nimport typing\nimport warnings\n\nfrom cryptography import utils\nfrom cr...	diff --git a/src/cryptography/x509/name.py b/src/cryptography/x509/name.py index 8b7e4ab430e4..4b32115781d1 100644 --- a/src/cryptography/x509/name.py +++ b/src/cryptography/x509/name.py @@ -17,6 +17,7 @@ class _ASN1Type(utils.Enum): BitString = 3 + OctetString = 4 UTF8String = 12 NumericString = 18 PrintableString = 19
liqd__a4-meinberlin-1740	2 link limit on nav items affects the footer, need more than 2 items	[ { "content": "from django.db import models\nfrom modelcluster.fields import ParentalKey\nfrom modelcluster.models import ClusterableModel\nfrom wagtail.admin import edit_handlers\nfrom wagtail.core.models import Orderable\nfrom wagtail.snippets.models import register_snippet\n\n\nclass MenuItem(models.Model):\n...	[ { "content": "from django.db import models\nfrom modelcluster.fields import ParentalKey\nfrom modelcluster.models import ClusterableModel\nfrom wagtail.admin import edit_handlers\nfrom wagtail.core.models import Orderable\nfrom wagtail.snippets.models import register_snippet\n\n\nclass MenuItem(models.Model):\n...	diff --git a/meinberlin/apps/cms/models/navigation_menues.py b/meinberlin/apps/cms/models/navigation_menues.py index 87eec0169b..d8b2ad88ff 100644 --- a/meinberlin/apps/cms/models/navigation_menues.py +++ b/meinberlin/apps/cms/models/navigation_menues.py @@ -32,7 +32,7 @@ def __str__(self): panels = [ edit_handlers.FieldPanel('title'), - edit_handlers.InlinePanel('items', max_num=2) + edit_handlers.InlinePanel('items') ] diff --git a/meinberlin/assets/scss/components/_footer.scss b/meinberlin/assets/scss/components/_footer.scss index 17616dd3b9..a04f779997 100644 --- a/meinberlin/assets/scss/components/_footer.scss +++ b/meinberlin/assets/scss/components/_footer.scss @@ -20,7 +20,9 @@ body { .footer-nav__link { display: inline-block; - padding: 0.7em; + padding-left: $padding; + padding-top: 0.7em; + padding-bottom: 0.7em; color: inherit; text-decoration: none; @@ -43,3 +45,11 @@ body { float: left; } } + +.beberlin__logo { + padding-right: $padding; +} + +.berlin__logo { + padding-left: $padding; +} diff --git a/meinberlin/templates/footer.html b/meinberlin/templates/footer.html index ba327ddc68..506015f099 100644 --- a/meinberlin/templates/footer.html +++ b/meinberlin/templates/footer.html @@ -3,11 +3,17 @@ <footer class="main-footer"> <div class="l-wrapper"> <div class="shariff" data-theme="white"></div> - <nav class="footer-nav"> + <nav class="footer-nav u-spacer-bottom-double"> {% get_menu "footer-nav" as footer_nav %} {% for item in footer_nav %} <a class="footer-nav__link" href="{{ item.url }}">{{ item.title }}</a> {% endfor %} </nav> + <div class="footer__logo"> + <img class="beberlin__logo" src="{% static 'images/beberlin.svg' %}" alt="be Berlin" width="127.5" height="30"/> + <a href="https://www.berlin.de/" class="berlin__logo" rel="home"> + <img src="{% static 'images/berlin_de.png' %}" alt="Zur Homepage von Berlin.de" width="125" height="31"/> + </a> + </div> </div> </footer>
pytorch__rl-1536	[BUG] TruncatedNormal crashing when computing entropy ## Describe the bug Calling `.entropy()` on a `TruncatedNormal` distribution causes the code to crash. ## To Reproduce First crash happened using a PPO agent with entropy bonus turned on and actor parametrized with a `TruncatedNormal`. A simple snippet to reproduce is the following: ```python import torch from torchrl.modules.distributions import IndependentNormal, TruncatedNormal if __name__ == '__main__': loc, scale = torch.zeros(1), torch.ones(1) d1 = IndependentNormal(loc, scale) print(d1.entropy()) d2 = TruncatedNormal(loc, scale) print(d2.entropy()) ``` ```bash tensor(1.4189) Traceback (most recent call last): File "/home/diego/Desktop/test.py", line 10, in <module> print(d2.entropy()) File "/home/diego/miniconda3/envs/pytorch/lib/python3.10/site-packages/torch/distributions/independent.py", line 103, in entropy entropy = self.base_dist.entropy() TypeError: 'Tensor' object is not callable ``` ## Expected behavior The entropy value should be returned. ## System info * Python 3.10.12 * torch 2.0.1 ```python import torchrl, numpy, sys print(torchrl.__version__, numpy.__version__, sys.version, sys.platform) ``` ``` 0.1.1 1.25.1 3.10.12 (main, Jul 5 2023, 18:54:27) [GCC 11.2.0] linux ``` ## Reason and Possible fixes In the `TruncatedStandardNormal` class, the `self._entropy` attribute is a constant tensor computed at initialization. For some reason, calling `TruncatedStandardNormal.entropy` returns the `self._entropy` attribute, rather than the `entropy()` property: ```python import torch from torchrl.modules.distributions.truncated_normal import TruncatedStandardNormal loc, scale = torch.zeros(1), torch.ones(1) print(TruncatedStandardNormal(loc, scale).entropy) print(TruncatedStandardNormal(loc, scale).entropy()) ``` ```bash tensor([-0.0104]) Traceback (most recent call last): File "/home/diego/Desktop/test.py", line 5, in <module> print(TruncatedStandardNormal(loc, scale).entropy()) TypeError: 'Tensor' object is not callable ``` ## Checklist - [x] I have checked that there is no similar issue in the repo (required) - [x] I have read the [documentation](https://github.com/pytorch/rl/tree/main/docs/) (required) - [x] I have provided a minimal working example to reproduce the bug (required)	[ { "content": "# Copyright (c) Meta Platforms, Inc. and affiliates.\n#\n# This source code is licensed under the MIT license found in the\n# LICENSE file in the root directory of this source tree.\n\n\n# from https://github.com/toshas/torch_truncnorm\n\nimport math\nfrom numbers import Number\n\nimport torch\nfr...	[ { "content": "# Copyright (c) Meta Platforms, Inc. and affiliates.\n#\n# This source code is licensed under the MIT license found in the\n# LICENSE file in the root directory of this source tree.\n\n\n# from https://github.com/toshas/torch_truncnorm\n\nimport math\nfrom numbers import Number\n\nimport torch\nfr...	diff --git a/test/test_distributions.py b/test/test_distributions.py index c804dcf7e53..30bb0288dd4 100644 --- a/test/test_distributions.py +++ b/test/test_distributions.py @@ -30,40 +30,46 @@ @pytest.mark.skipif(torch.__version__ < "2.0", reason="torch 2.0 is required") @pytest.mark.parametrize("device", get_default_devices()) -@pytest.mark.parametrize("div_up", [1, 2]) -@pytest.mark.parametrize("div_down", [1, 2]) -def test_delta(device, div_up, div_down): - x = torch.randn(1000000, 4, device=device, dtype=torch.double) - d = Delta(x) - assert d.log_prob(d.mode).shape == x.shape[:-1] - assert (d.log_prob(d.mode) == float("inf")).all() - - x = torch.randn(1000000, 4, device=device, dtype=torch.double) - d = TanhDelta(x, -1 / div_down, 1.0 / div_up, atol=1e-4, rtol=1e-4) - xinv = d.transforms[0].inv(d.mode) - assert d.base_dist._is_equal(xinv).all() - assert d.log_prob(d.mode).shape == x.shape[:-1] - assert (d.log_prob(d.mode) == float("inf")).all() - - x = torch.randn(1000000, 4, device=device, dtype=torch.double) - d = TanhDelta( - x, - -torch.ones_like(x) / div_down, - torch.ones_like(x) / div_up, - atol=1e-4, - rtol=1e-4, - ) - xinv = d.transforms[0].inv(d.mode) - assert d.base_dist._is_equal(xinv).all() - assert d.log_prob(d.mode).shape == x.shape[:-1] - assert (d.log_prob(d.mode) == float("inf")).all() +class TestDelta: + def test_delta_logprob(self, device): + x = torch.randn(1000000, 4, device=device, dtype=torch.double) + d = Delta(x) + assert d.log_prob(d.mode).shape == x.shape[:-1] + assert (d.log_prob(d.mode) == float("inf")).all() + + @pytest.mark.parametrize("div_up", [1, 2]) + @pytest.mark.parametrize("div_down", [1, 2]) + def test_tanhdelta_logprob(self, device, div_up, div_down): + x = torch.randn(1000000, 4, device=device, dtype=torch.double) + d = TanhDelta(x, -1 / div_down, 1.0 / div_up, atol=1e-4, rtol=1e-4) + xinv = d.transforms[0].inv(d.mode) + assert d.base_dist._is_equal(xinv).all() + assert d.log_prob(d.mode).shape == x.shape[:-1] + assert (d.log_prob(d.mode) == float("inf")).all() + + @pytest.mark.parametrize("div_up", [1, 2]) + @pytest.mark.parametrize("div_down", [1, 2]) + def test_tanhdelta_inv(self, device, div_up, div_down): + x = torch.randn(1000000, 4, device=device, dtype=torch.double) + d = TanhDelta( + x, + -torch.ones_like(x) / div_down, + torch.ones_like(x) / div_up, + atol=1e-4, + rtol=1e-4, + ) + xinv = d.transforms[0].inv(d.mode) + assert d.base_dist._is_equal(xinv).all() + assert d.log_prob(d.mode).shape == x.shape[:-1] + assert (d.log_prob(d.mode) == float("inf")).all() - x = torch.randn(1000000, 4, device=device) - d = TanhDelta(x, -torch.ones_like(x), torch.ones_like(x), atol=1e-4, rtol=1e-4) - xinv = d.transforms[0].inv(d.mode) - assert d.base_dist._is_equal(xinv).all() - assert d.log_prob(d.mode).shape == x.shape[:-1] - assert (d.log_prob(d.mode) == float("inf")).all() + def test_tanhdelta_inv_ones(self, device): + x = torch.randn(1000000, 4, device=device) + d = TanhDelta(x, -torch.ones_like(x), torch.ones_like(x), atol=1e-4, rtol=1e-4) + xinv = d.transforms[0].inv(d.mode) + assert d.base_dist._is_equal(xinv).all() + assert d.log_prob(d.mode).shape == x.shape[:-1] + assert (d.log_prob(d.mode) == float("inf")).all() def _map_all(tensors_or_other, device): @@ -74,42 +80,43 @@ def _map_all(tensors_or_other, device): yield t -@pytest.mark.parametrize( - "min", [-torch.ones(3), -1, 3 * torch.tensor([-1.0, -2.0, -0.5]), -0.1] -) -@pytest.mark.parametrize( - "max", [torch.ones(3), 1, 3 * torch.tensor([1.0, 2.0, 0.5]), 0.1] -) -@pytest.mark.parametrize( - "vecs", - [ - (torch.tensor([0.1, 10.0, 5.0]), torch.tensor([0.1, 10.0, 5.0])), - (torch.zeros(7, 3), torch.ones(7, 3)), - ], -) -@pytest.mark.parametrize( - "upscale", [torch.ones(3), 1, 3 * torch.tensor([1.0, 2.0, 0.5]), 3] -) -@pytest.mark.parametrize("shape", [torch.Size([]), torch.Size([3, 4])]) -@pytest.mark.parametrize("device", get_default_devices()) -def test_tanhnormal(min, max, vecs, upscale, shape, device): - min, max, vecs, upscale, shape = _map_all( - min, max, vecs, upscale, shape, device=device +class TestTanhNormal: + @pytest.mark.parametrize( + "min", [-torch.ones(3), -1, 3 * torch.tensor([-1.0, -2.0, -0.5]), -0.1] ) - torch.manual_seed(0) - d = TanhNormal( - vecs, - upscale=upscale, - min=min, - max=max, + @pytest.mark.parametrize( + "max", [torch.ones(3), 1, 3 torch.tensor([1.0, 2.0, 0.5]), 0.1] ) - for _ in range(100): - a = d.rsample(shape) - assert a.shape[: len(shape)] == shape - assert (a >= d.min).all() - assert (a <= d.max).all() - lp = d.log_prob(a) - assert torch.isfinite(lp).all() + @pytest.mark.parametrize( + "vecs", + [ + (torch.tensor([0.1, 10.0, 5.0]), torch.tensor([0.1, 10.0, 5.0])), + (torch.zeros(7, 3), torch.ones(7, 3)), + ], + ) + @pytest.mark.parametrize( + "upscale", [torch.ones(3), 1, 3 * torch.tensor([1.0, 2.0, 0.5]), 3] + ) + @pytest.mark.parametrize("shape", [torch.Size([]), torch.Size([3, 4])]) + @pytest.mark.parametrize("device", get_default_devices()) + def test_tanhnormal(self, min, max, vecs, upscale, shape, device): + min, max, vecs, upscale, shape = _map_all( + min, max, vecs, upscale, shape, device=device + ) + torch.manual_seed(0) + d = TanhNormal( + vecs, + upscale=upscale, + min=min, + max=max, + ) + for _ in range(100): + a = d.rsample(shape) + assert a.shape[: len(shape)] == shape + assert (a >= d.min).all() + assert (a <= d.max).all() + lp = d.log_prob(a) + assert torch.isfinite(lp).all() @pytest.mark.parametrize( @@ -130,24 +137,40 @@ def test_tanhnormal(min, max, vecs, upscale, shape, device): ) @pytest.mark.parametrize("shape", [torch.Size([]), torch.Size([3, 4])]) @pytest.mark.parametrize("device", get_default_devices()) -def test_truncnormal(min, max, vecs, upscale, shape, device): - torch.manual_seed(0) - min, max, vecs, upscale, shape = _map_all( - min, max, vecs, upscale, shape, device=device - ) - d = TruncatedNormal( - vecs, - upscale=upscale, - min=min, - max=max, - ) - for _ in range(100): - a = d.rsample(shape) - assert a.shape[: len(shape)] == shape - assert (a >= d.min).all() - assert (a <= d.max).all() - lp = d.log_prob(a) - assert torch.isfinite(lp).all() +class TestTruncatedNormal: + def test_truncnormal(self, min, max, vecs, upscale, shape, device): + torch.manual_seed(0) + min, max, vecs, upscale, shape = _map_all( + min, max, vecs, upscale, shape, device=device + ) + d = TruncatedNormal( + vecs, + upscale=upscale, + min=min, + max=max, + ) + for _ in range(100): + a = d.rsample(shape) + assert a.shape[: len(shape)] == shape + assert (a >= d.min).all() + assert (a <= d.max).all() + lp = d.log_prob(a) + assert torch.isfinite(lp).all() + + def test_truncnormal_mode(self, min, max, vecs, upscale, shape, device): + torch.manual_seed(0) + min, max, vecs, upscale, shape = _map_all( + min, max, vecs, upscale, shape, device=device + ) + d = TruncatedNormal( + vecs, + upscale=upscale, + min=min, + max=max, + ) + assert d.mode is not None + assert d.entropy() is not None + assert d.mean is not None @pytest.mark.parametrize( diff --git a/torchrl/modules/distributions/truncated_normal.py b/torchrl/modules/distributions/truncated_normal.py index 1dfde393709..59b95658ea5 100644 --- a/torchrl/modules/distributions/truncated_normal.py +++ b/torchrl/modules/distributions/truncated_normal.py @@ -87,7 +87,6 @@ def mean(self): def variance(self): return self._variance - @property def entropy(self): return self._entropy
conda__conda-build-3082	Build variants does not work with source repo revision variations With a `meta.yaml` that contains: ``` source: svn_url: an_url svn_rev: {{ version }} ``` and a `conda_build_config.yaml` with: ``` version: - 1 - 2 ``` Both packages are built from the same sources of the first version, the repo is only checked out once. Am I doing it properly or is it a bug?	[ { "content": "from __future__ import absolute_import, division, print_function\n\nimport contextlib\nimport json\nimport logging\nimport multiprocessing\nimport os\nimport platform\nimport re\nimport subprocess\nimport sys\nimport warnings\nfrom glob import glob\nfrom os.path import join, normpath\n\n# noqa her...	[ { "content": "from __future__ import absolute_import, division, print_function\n\nimport contextlib\nimport json\nimport logging\nimport multiprocessing\nimport os\nimport platform\nimport re\nimport subprocess\nimport sys\nimport warnings\nfrom glob import glob\nfrom os.path import join, normpath\n\n# noqa her...	diff --git a/conda_build/environ.py b/conda_build/environ.py index e67982bfd6..9afe7a026f 100644 --- a/conda_build/environ.py +++ b/conda_build/environ.py @@ -154,7 +154,6 @@ def verify_git_repo(git_exe, git_dir, git_url, git_commits_since_tag, debug=Fals return OK -@memoized def get_git_info(git_exe, repo, debug): """ Given a repo to a git repo, return a dictionary of: diff --git a/tests/test-recipes/variants/29_different_git_vars/conda_build_config.yaml b/tests/test-recipes/variants/29_different_git_vars/conda_build_config.yaml new file mode 100644 index 0000000000..b6f56ca4bd --- /dev/null +++ b/tests/test-recipes/variants/29_different_git_vars/conda_build_config.yaml @@ -0,0 +1,3 @@ +git_tag: + - 1.21.11 + - 1.20.0 diff --git a/tests/test-recipes/variants/29_different_git_vars/meta.yaml b/tests/test-recipes/variants/29_different_git_vars/meta.yaml new file mode 100644 index 0000000000..0c0231ccb3 --- /dev/null +++ b/tests/test-recipes/variants/29_different_git_vars/meta.yaml @@ -0,0 +1,15 @@ +package: + name: conda-build-test-variant-git + version: {{ GIT_DESCRIBE_TAG }} + +source: + git_url: https://github.com/conda/conda_build_test_recipe + git_tag: {{ git_tag }} + +build: + number: {{ GIT_DESCRIBE_NUMBER }} + +requirements: + build: + - python + diff --git a/tests/test_variants.py b/tests/test_variants.py index 58c360c2f4..4b2366ce36 100644 --- a/tests/test_variants.py +++ b/tests/test_variants.py @@ -441,3 +441,11 @@ def test_custom_compiler(): recipe = os.path.join(recipe_dir, '28_custom_compiler') ms = api.render(recipe, permit_unsatisfiable_variants=True, finalize=False, bypass_env_check=True) assert len(ms) == 3 + + +def test_different_git_vars(): + recipe = os.path.join(recipe_dir, '29_different_git_vars') + ms = api.render(recipe) + versions = [m[0].version() for m in ms] + assert "1.20.0" in versions + assert "1.21.11" in versions
nltk__nltk-3156	Class 'CharTokenizer' is missing attribute '_string' I think the class `CharTokenizer` is missing the attribute `_string=""` https://github.com/nltk/nltk/blob/fc53edbf6f0763971afca5855386a2a382da37ac/nltk/tokenize/simple.py#L68-L77 Without this attribute, when trying to use the class, I get the following error: `TypeError: Can't instantiate abstract class CharTokenizer with abstract method _string` Example code: ```python from nltk.tokenize.simple import CharTokenizer tokenizer = CharTokenizer() ``` Error: ```bash Traceback (most recent call last): File "/home/francis/.local/share/virtualenvs/cafa-challenge-bUqSu2Tm/lib/python3.10/site-packages/IPython/core/interactiveshell.py", line 3508, in run_code exec(code_obj, self.user_global_ns, self.user_ns) File "<ipython-input-7-803c2e672729>", line 1, in <module> tokenizer = CharTokenizer() TypeError: Can't instantiate abstract class CharTokenizer with abstract method _string ```	[ { "content": "# Natural Language Toolkit: Simple Tokenizers\n#\n# Copyright (C) 2001-2023 NLTK Project\n# Author: Edward Loper <edloper@gmail.com>\n# Steven Bird <stevenbird1@gmail.com>\n# URL: <https://www.nltk.org>\n# For license information, see LICENSE.TXT\n\nr\"\"\"\nSimple Tokenizers\n\nThese toke...	[ { "content": "# Natural Language Toolkit: Simple Tokenizers\n#\n# Copyright (C) 2001-2023 NLTK Project\n# Author: Edward Loper <edloper@gmail.com>\n# Steven Bird <stevenbird1@gmail.com>\n# URL: <https://www.nltk.org>\n# For license information, see LICENSE.TXT\n\nr\"\"\"\nSimple Tokenizers\n\nThese toke...	diff --git a/nltk/test/unit/test_tokenize.py b/nltk/test/unit/test_tokenize.py index 7688f52397..662b4562b2 100644 --- a/nltk/test/unit/test_tokenize.py +++ b/nltk/test/unit/test_tokenize.py @@ -16,6 +16,7 @@ sent_tokenize, word_tokenize, ) +from nltk.tokenize.simple import CharTokenizer def load_stanford_segmenter(): @@ -865,3 +866,21 @@ class ExtLangVars(punkt.PunktLanguageVars): ) def test_sent_tokenize(self, sentences: str, expected: List[str]): assert sent_tokenize(sentences) == expected + + def test_string_tokenizer(self) -> None: + sentence = "Hello there" + tokenizer = CharTokenizer() + assert tokenizer.tokenize(sentence) == list(sentence) + assert list(tokenizer.span_tokenize(sentence)) == [ + (0, 1), + (1, 2), + (2, 3), + (3, 4), + (4, 5), + (5, 6), + (6, 7), + (7, 8), + (8, 9), + (9, 10), + (10, 11), + ] diff --git a/nltk/tokenize/simple.py b/nltk/tokenize/simple.py index 71a02d3098..54b2bf8440 100644 --- a/nltk/tokenize/simple.py +++ b/nltk/tokenize/simple.py @@ -70,6 +70,8 @@ class CharTokenizer(StringTokenizer): is ever required directly, use ``for char in string``. """ + _string = None + def tokenize(self, s): return list(s)