mirror of
https://github.com/narrrl/proton-drive-linux.git
synced 2026-11-22 10:33:31 +01:00
feat(gui): offline basemap under the Places map
Places now draws the proton-map-rs basemap that Proton Gallery uses: seas by depth, lakes, rivers, built-up areas, borders and town names, in light and dark. Tiles render on two worker threads into the existing tile layer, so caching, ancestor stand-ins and density restarts work as before. Opening Places sends no request. The OpenFreeMap street map stays opt-in and replaces the basemap while it is turned on. Without the basemap file the map falls back to the coarse Natural Earth outlines. scripts/fetch-basemap.sh downloads basemap-v1.pmtiles and checks it against a pinned SHA-256. The deb, rpm, tarball, local and AUR PKGBUILDs, COPR spec and Nix package install it to /usr/share/proton-drive-linux. PDFS_BASEMAP points the app at another copy. The new credit and preference text is translated in every catalog.
This commit is contained in:
1 parent
7be4c7db1e
commit
795dd7edb0
34 files changed
+753
-292
No files matched your search
@@ -159,6 +159,9 @@ jobs:
|
||||
install -Dm644 packaging/io.narl.proton-drive-linux.policy deb/usr/share/polkit-1/actions/io.narl.proton-drive-linux.policy
|
||||
cp packaging/proton-drive.service deb/usr/lib/systemd/user/
|
||||
cp LICENSE deb/usr/share/licenses/proton-drive-linux/
|
||||
# The offline Places basemap, already fetched for the tarball.
|
||||
scripts/fetch-basemap.sh
|
||||
install -Dm644 data/basemap-v1.pmtiles deb/usr/share/proton-drive-linux/basemap-v1.pmtiles
|
||||
po/build.sh deb/usr/share/locale
|
||||
packaging/completions.sh target/release/pdfs deb/usr/share
|
||||
|
||||
@@ -191,6 +194,8 @@ jobs:
|
||||
|
||||
- name: Package Fedora package (.rpm)
|
||||
run: |
|
||||
# The in-tree spec build installs the basemap from data/.
|
||||
scripts/fetch-basemap.sh
|
||||
# Sanitize version (replace hyphens with dots for RPM compatibility)
|
||||
RPM_VERSION=$(echo "${{ env.VERSION }}" | tr '-' '.')
|
||||
|
||||
|
||||
@@ -65,6 +65,7 @@ jobs:
|
||||
git config --global --add safe.directory "$GITHUB_WORKSPACE"
|
||||
VERSION=$(grep -m1 '^version' Cargo.toml | cut -d'"' -f2)
|
||||
SHORT=${GITHUB_SHA::7}
|
||||
scripts/fetch-basemap.sh
|
||||
mkdir -p rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS,BUILDROOT,db}
|
||||
rpmbuild -bb \
|
||||
--nodeps \
|
||||
|
||||
@@ -5,3 +5,4 @@
|
||||
/rpmbuild
|
||||
/result
|
||||
/result-*
|
||||
/data/*.pmtiles
|
||||
Generated
+81
@@ -2,6 +2,22 @@
|
||||
# It is not intended for manual editing.
|
||||
version = 4
|
||||
|
||||
[[package]]
|
||||
name = "ab_glyph"
|
||||
version = "0.2.32"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "01c0457472c38ea5bd1c3b5ada5e368271cb550be7a4ca4a0b4634e9913f6cc2"
|
||||
dependencies = [
|
||||
"ab_glyph_rasterizer",
|
||||
"owned_ttf_parser",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ab_glyph_rasterizer"
|
||||
version = "0.1.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "366ffbaa4442f4684d91e2cd7c5ea7c4ed8add41959a31447066e279e432b618"
|
||||
|
||||
[[package]]
|
||||
name = "adler2"
|
||||
version = "2.0.1"
|
||||
@@ -232,6 +248,12 @@ dependencies = [
|
||||
"zeroize",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "arrayref"
|
||||
version = "0.3.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb"
|
||||
|
||||
[[package]]
|
||||
name = "arrayvec"
|
||||
version = "0.7.8"
|
||||
@@ -3425,6 +3447,15 @@ dependencies = [
|
||||
"pin-project-lite",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "owned_ttf_parser"
|
||||
version = "0.25.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "36820e9051aca1014ddc75770aab4d68bc1e9e632f0f5627c4086bc216fb583b"
|
||||
dependencies = [
|
||||
"ttf-parser",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "p256"
|
||||
version = "0.13.2"
|
||||
@@ -3696,6 +3727,7 @@ dependencies = [
|
||||
"pangocairo",
|
||||
"pdfs-core",
|
||||
"proton-gallery-rs",
|
||||
"proton-map-rs",
|
||||
"reqwest",
|
||||
"serde",
|
||||
"serde_json",
|
||||
@@ -4045,6 +4077,18 @@ dependencies = [
|
||||
"zip",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "proton-map-rs"
|
||||
version = "0.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a8440e8a25b89e1c3d3c0747285ebc558e84a019b237307111f21306f183e78d"
|
||||
dependencies = [
|
||||
"ab_glyph",
|
||||
"flate2",
|
||||
"thiserror 2.0.21",
|
||||
"tiny-skia",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "proton-media-rs"
|
||||
version = "0.1.1"
|
||||
@@ -5093,6 +5137,12 @@ version = "1.2.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596"
|
||||
|
||||
[[package]]
|
||||
name = "strict-num"
|
||||
version = "0.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731"
|
||||
|
||||
[[package]]
|
||||
name = "strsim"
|
||||
version = "0.11.1"
|
||||
@@ -5267,6 +5317,31 @@ dependencies = [
|
||||
"zune-jpeg",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tiny-skia"
|
||||
version = "0.11.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "83d13394d44dae3207b52a326c0c85a8bf87f1541f23b0d143811088497b09ab"
|
||||
dependencies = [
|
||||
"arrayref",
|
||||
"arrayvec",
|
||||
"bytemuck",
|
||||
"cfg-if",
|
||||
"log",
|
||||
"tiny-skia-path",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tiny-skia-path"
|
||||
version = "0.11.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9c9e7fc0c2e86a30b117d0462aa261b72b7a99b7ebd7deb3a14ceda95c5bdc93"
|
||||
dependencies = [
|
||||
"arrayref",
|
||||
"bytemuck",
|
||||
"strict-num",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tinystr"
|
||||
version = "0.8.5"
|
||||
@@ -5504,6 +5579,12 @@ version = "0.2.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
|
||||
|
||||
[[package]]
|
||||
name = "ttf-parser"
|
||||
version = "0.25.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d2df906b07856748fa3f6e0ad0cbaa047052d4a7dd609e231c4f72cee8c36f31"
|
||||
|
||||
[[package]]
|
||||
name = "twofish"
|
||||
version = "0.7.1"
|
||||
|
||||
@@ -19,6 +19,7 @@ proton-sdk = { version = "0.12.4" }
|
||||
proton-drive-rs = { version = "0.12.4" }
|
||||
proton-gallery-app-rs = "0.1.0"
|
||||
proton-gallery-rs = "0.1.5"
|
||||
proton-map-rs = "0.1.0"
|
||||
chrono = { version = "0.4", default-features = false, features = ["std"] }
|
||||
|
||||
# Internal crates.
|
||||
|
||||
@@ -193,7 +193,8 @@ Proton Drive Linux is free and built in spare time. If it saves you a few headac
|
||||
Released under the [MIT License](LICENSE).
|
||||
|
||||
The Places map uses [GeoNames](https://www.geonames.org/) data (CC BY 4.0) and
|
||||
[Natural Earth](https://www.naturalearthdata.com/) outlines (public domain). The optional street
|
||||
[Natural Earth](https://www.naturalearthdata.com/) land, water and borders (public domain), drawn
|
||||
through [proton-map-rs](https://github.com/narrrl/proton-rs). The optional street
|
||||
map comes from [OpenFreeMap](https://openfreemap.org/), © [OpenStreetMap](https://www.openstreetmap.org/copyright)
|
||||
contributors.
|
||||
|
||||
|
||||
@@ -23,6 +23,8 @@ path = "src/prompt.rs"
|
||||
|
||||
[dependencies]
|
||||
proton-gallery-rs.workspace = true
|
||||
# The offline basemap under the Places map.
|
||||
proton-map-rs.workspace = true
|
||||
base64.workspace = true
|
||||
pdfs-core.workspace = true
|
||||
tracing.workspace = true
|
||||
@@ -43,3 +45,7 @@ pangocairo = "0.22"
|
||||
reqwest = { version = "0.13", default-features = false, features = ["rustls", "webpki-roots"] }
|
||||
# The system libintl (glibc) rather than a bundled gettext build.
|
||||
gettext-rs = { version = "0.8", features = ["gettext-system"] }
|
||||
|
||||
[dev-dependencies]
|
||||
# Builds small basemaps for the map tests.
|
||||
proton-map-rs = { workspace = true, features = ["writer"] }
|
||||
@@ -1476,7 +1476,7 @@ fn install_window_actions(ui: &Rc<Ui>, window: &adw::ApplicationWindow) {
|
||||
None,
|
||||
gtk4::License::Custom,
|
||||
Some(&gettext(
|
||||
"The places map is drawn from <a href=\"https://www.naturalearthdata.com/\">Natural Earth</a> land outlines and country borders, which are in the public domain.",
|
||||
"The places map is drawn from <a href=\"https://www.naturalearthdata.com/\">Natural Earth</a> land, water and borders, which are in the public domain.",
|
||||
)),
|
||||
);
|
||||
dialog.add_legal_section(
|
||||
|
||||
@@ -1,7 +1,12 @@
|
||||
//! The online street map under the Places map: vector tiles from OpenFreeMap,
|
||||
//! fetched and drawn on a worker thread, and handed to the map as finished
|
||||
//! images.
|
||||
//! The tiles under the Places map, made on worker threads and handed to the
|
||||
//! map as finished images. They come from one of two sources.
|
||||
//!
|
||||
//! The offline basemap is a PMTiles file installed with the app and drawn by
|
||||
//! `proton-map-rs`, the same map Proton Gallery shows: seas, lakes, rivers,
|
||||
//! built-up areas, borders and town names from Natural Earth and GeoNames.
|
||||
//! It sends nothing anywhere. Its names are drawn into the tiles.
|
||||
//!
|
||||
//! The online street map is vector tiles from OpenFreeMap.
|
||||
//! It is off unless turned on in Preferences, since every tile fetched tells
|
||||
//! OpenFreeMap which part of the world is being looked at. OpenFreeMap needs
|
||||
//! no account or key, and its tiles are OpenStreetMap data in the
|
||||
@@ -20,9 +25,17 @@ use std::sync::{Arc, Mutex};
|
||||
use std::time::Duration;
|
||||
|
||||
use gtk4::cairo;
|
||||
use proton_map::{Basemap, Style, TileId};
|
||||
|
||||
use super::mvt::{self, Kind, Layer};
|
||||
|
||||
/// The basemap's file name, wherever it is installed.
|
||||
pub(crate) const BASEMAP_FILE: &str = "basemap-v1.pmtiles";
|
||||
|
||||
/// How many threads draw basemap tiles. Drawing is all CPU; two keep the map
|
||||
/// quick without taking the machine.
|
||||
const BASEMAP_THREADS: usize = 2;
|
||||
|
||||
/// Where OpenFreeMap describes its current tile set.
|
||||
const TILEJSON_URL: &str = "https://tiles.openfreemap.org/planet";
|
||||
|
||||
@@ -254,8 +267,20 @@ struct Job {
|
||||
dark: bool,
|
||||
}
|
||||
|
||||
/// The worker thread making tiles. Dropping it stops the thread once the
|
||||
/// fetches under way are done.
|
||||
/// Where a tile worker gets its tiles.
|
||||
pub(crate) enum Source {
|
||||
/// OpenFreeMap's street map, cached under `cache_dir`, with names in
|
||||
/// `language` where the map has them.
|
||||
Online {
|
||||
cache_dir: PathBuf,
|
||||
language: String,
|
||||
},
|
||||
/// The basemap installed at this path.
|
||||
Offline(PathBuf),
|
||||
}
|
||||
|
||||
/// The worker threads making tiles. Dropping it stops them once the tiles
|
||||
/// under way are done.
|
||||
pub(crate) struct Tiles {
|
||||
jobs: async_channel::Sender<Job>,
|
||||
wanted: Arc<Mutex<HashSet<TileKey>>>,
|
||||
@@ -264,27 +289,35 @@ pub(crate) struct Tiles {
|
||||
}
|
||||
|
||||
impl Tiles {
|
||||
/// Start the worker, caching under `cache_dir`, drawing names in
|
||||
/// `language` where the map has them. Finished tiles arrive on the
|
||||
/// returned channel.
|
||||
pub(crate) fn start(
|
||||
cache_dir: PathBuf,
|
||||
language: String,
|
||||
scale: i32,
|
||||
) -> (Self, async_channel::Receiver<Done>) {
|
||||
/// Start the worker for `source`. Finished tiles arrive on the returned
|
||||
/// channel.
|
||||
pub(crate) fn start(source: Source, scale: i32) -> (Self, async_channel::Receiver<Done>) {
|
||||
let (jobs, job_rx) = async_channel::unbounded();
|
||||
let (done_tx, done_rx) = async_channel::unbounded();
|
||||
let wanted = Arc::new(Mutex::new(HashSet::new()));
|
||||
let worker = Worker {
|
||||
dir: cache_dir,
|
||||
language,
|
||||
scale,
|
||||
wanted: wanted.clone(),
|
||||
done: done_tx,
|
||||
let spawned = match source {
|
||||
Source::Online {
|
||||
cache_dir,
|
||||
language,
|
||||
} => {
|
||||
let worker = Worker {
|
||||
dir: cache_dir,
|
||||
language,
|
||||
scale,
|
||||
wanted: wanted.clone(),
|
||||
done: done_tx,
|
||||
};
|
||||
std::thread::Builder::new()
|
||||
.name("map-tiles".into())
|
||||
.spawn(move || worker.run(job_rx))
|
||||
}
|
||||
Source::Offline(path) => {
|
||||
let wanted = wanted.clone();
|
||||
std::thread::Builder::new()
|
||||
.name("map-basemap".into())
|
||||
.spawn(move || draw_basemap(&path, scale, &wanted, &job_rx, &done_tx))
|
||||
}
|
||||
};
|
||||
let spawned = std::thread::Builder::new()
|
||||
.name("map-tiles".into())
|
||||
.spawn(move || worker.run(job_rx));
|
||||
if let Err(e) = spawned {
|
||||
tracing::warn!("map tiles: cannot start the worker: {e}");
|
||||
}
|
||||
@@ -463,6 +496,126 @@ impl Worker {
|
||||
}
|
||||
}
|
||||
|
||||
/// Where the basemap may be installed, most specific first.
|
||||
fn basemap_paths() -> Vec<PathBuf> {
|
||||
let mut paths = Vec::new();
|
||||
if let Some(path) = std::env::var_os("PDFS_BASEMAP") {
|
||||
paths.push(PathBuf::from(path));
|
||||
}
|
||||
if let Some(dir) = std::env::current_exe()
|
||||
.ok()
|
||||
.and_then(|exe| exe.parent().map(Path::to_path_buf))
|
||||
{
|
||||
paths.push(dir.join("../share/proton-drive-linux").join(BASEMAP_FILE));
|
||||
}
|
||||
paths.push(Path::new("/usr/share/proton-drive-linux").join(BASEMAP_FILE));
|
||||
if let Some(dir) = std::env::var_os("XDG_DATA_HOME")
|
||||
.map(PathBuf::from)
|
||||
.or_else(|| std::env::var_os("HOME").map(|home| Path::new(&home).join(".local/share")))
|
||||
{
|
||||
paths.push(dir.join("proton-drive-linux").join(BASEMAP_FILE));
|
||||
}
|
||||
if cfg!(debug_assertions) {
|
||||
// `scripts/fetch-basemap.sh` puts it here for development builds.
|
||||
paths
|
||||
.push(Path::new(concat!(env!("CARGO_MANIFEST_DIR"), "/../../data")).join(BASEMAP_FILE));
|
||||
}
|
||||
paths
|
||||
}
|
||||
|
||||
/// The installed basemap's path, if there is one.
|
||||
pub(crate) fn find_basemap() -> Option<PathBuf> {
|
||||
basemap_paths().into_iter().find(|path| path.is_file())
|
||||
}
|
||||
|
||||
/// The basemap, read once per run: the map restarts its worker when the
|
||||
/// window moves to a screen of another density, and the file is 25 MB.
|
||||
fn open_basemap(path: &Path) -> Option<Arc<Basemap>> {
|
||||
static OPENED: Mutex<Option<(PathBuf, Arc<Basemap>)>> = Mutex::new(None);
|
||||
let mut opened = OPENED.lock().ok()?;
|
||||
if let Some((at, basemap)) = opened.as_ref()
|
||||
&& at == path
|
||||
{
|
||||
return Some(basemap.clone());
|
||||
}
|
||||
match Basemap::open(path) {
|
||||
Ok(basemap) => {
|
||||
let basemap = Arc::new(basemap);
|
||||
*opened = Some((path.to_path_buf(), basemap.clone()));
|
||||
Some(basemap)
|
||||
}
|
||||
Err(e) => {
|
||||
tracing::warn!("map tiles: cannot open the basemap: {e}");
|
||||
None
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Open the basemap at `path` and draw the tiles asked for on
|
||||
/// [`BASEMAP_THREADS`] threads until the map lets go of the worker. Without
|
||||
/// a readable basemap every tile fails, and the outline shows.
|
||||
fn draw_basemap(
|
||||
path: &Path,
|
||||
scale: i32,
|
||||
wanted: &Mutex<HashSet<TileKey>>,
|
||||
jobs: &async_channel::Receiver<Job>,
|
||||
done: &async_channel::Sender<Done>,
|
||||
) {
|
||||
let basemap = open_basemap(path);
|
||||
std::thread::scope(|scope| {
|
||||
for _ in 0..BASEMAP_THREADS {
|
||||
let basemap = basemap.clone();
|
||||
scope.spawn(move || {
|
||||
while let Ok(job) = jobs.recv_blocking() {
|
||||
let key = job.key;
|
||||
let still_wanted = wanted.lock().map(|w| w.contains(&key)).unwrap_or(true);
|
||||
let result = match &basemap {
|
||||
_ if !still_wanted => Done::Dropped(key),
|
||||
Some(basemap) => Done::Tile(draw_basemap_tile(basemap, job, scale)),
|
||||
None => Done::Failed(key),
|
||||
};
|
||||
if done.send_blocking(result).is_err() {
|
||||
break;
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
/// One basemap tile at `scale` device px per logical px.
|
||||
fn draw_basemap_tile(basemap: &Basemap, job: Job, scale: i32) -> Raster {
|
||||
let style = if job.dark {
|
||||
Style::dark()
|
||||
} else {
|
||||
Style::light()
|
||||
};
|
||||
let key = job.key;
|
||||
let tile = proton_map::render_tile(
|
||||
basemap,
|
||||
TileId::new(key.z, key.x, key.y),
|
||||
scale.max(1) as f32,
|
||||
&style,
|
||||
);
|
||||
Raster {
|
||||
key,
|
||||
dark: job.dark,
|
||||
edge: tile.width as i32,
|
||||
pixels: rgba_to_cairo(tile.rgba),
|
||||
labels: Vec::new(),
|
||||
}
|
||||
}
|
||||
|
||||
/// Premultiplied RGBA bytes to cairo's premultiplied ARGB, one native-endian
|
||||
/// word per pixel.
|
||||
fn rgba_to_cairo(mut pixels: Vec<u8>) -> Vec<u8> {
|
||||
for px in pixels.as_chunks_mut::<4>().0 {
|
||||
let [r, g, b, a] = *px;
|
||||
*px = u32::from_be_bytes([a, r, g, b]).to_ne_bytes();
|
||||
}
|
||||
pixels
|
||||
}
|
||||
|
||||
/// The first tile URL template in a TileJSON document.
|
||||
fn tile_template(json: &[u8]) -> Option<String> {
|
||||
let doc: serde_json::Value = serde_json::from_slice(json).ok()?;
|
||||
@@ -823,6 +976,42 @@ fn label_name(layer: &Layer, feature: &mvt::Feature, language: &str) -> Option<S
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
fn empty_basemap() -> Basemap {
|
||||
Basemap::from_bytes(proton_map::pmtiles::writer::Writer::new().finish(
|
||||
"{}",
|
||||
[-180.0, -85.0, 180.0, 85.0],
|
||||
[0.0, 0.0],
|
||||
))
|
||||
.expect("empty archive opens")
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn rgba_pixels_become_cairo_words() {
|
||||
let pixels = rgba_to_cairo(vec![0x11, 0x22, 0x33, 0xff]);
|
||||
let word = u32::from_ne_bytes(pixels.try_into().expect("one pixel"));
|
||||
assert_eq!(word, 0xff11_2233);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn basemap_tiles_come_at_the_screen_density_in_the_theme_asked() {
|
||||
let basemap = empty_basemap();
|
||||
let key = TileKey { z: 3, x: 4, y: 2 };
|
||||
for dark in [false, true] {
|
||||
let raster = draw_basemap_tile(&basemap, Job { key, dark }, 2);
|
||||
assert_eq!((raster.key, raster.dark), (key, dark));
|
||||
assert_eq!(raster.edge, 512);
|
||||
assert_eq!(raster.pixels.len(), 512 * 512 * 4);
|
||||
// An empty basemap is all open sea.
|
||||
let sea = if dark { Style::dark() } else { Style::light() }.water[0];
|
||||
let word = u32::from_ne_bytes(raster.pixels[..4].try_into().expect("a pixel"));
|
||||
assert_eq!(
|
||||
word & 0x00ff_ffff,
|
||||
u32::from_be_bytes([0, sea.r, sea.g, sea.b])
|
||||
);
|
||||
assert!(raster.surface().is_some());
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn deep_tiles_draw_from_their_ancestor_at_the_data_zoom() {
|
||||
let key = TileKey {
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
//! their newest photo, and once the map is zoomed in close, each photo where
|
||||
//! it was taken.
|
||||
//!
|
||||
//! Underneath is one of two maps. The built-in one is drawn here from Natural
|
||||
//! Underneath are up to two maps. The outline is drawn here from Natural
|
||||
//! Earth's 1:50m land polygons and country borders (public domain), trimmed
|
||||
//! into `data/land.txt` and `data/borders.txt` by
|
||||
//! `scripts/natural-earth-land.py`; it needs no network and tells nobody
|
||||
//! anything. The street map from OpenFreeMap ([`super::map_tiles`]) is
|
||||
//! opt-in, in Preferences, and draws over the built-in one wherever its tiles
|
||||
//! have arrived.
|
||||
//! `scripts/natural-earth-land.py`, and is always there. Over it go tiles
|
||||
//! ([`super::map_tiles`]) wherever they have arrived: the offline basemap
|
||||
//! installed with the app, which needs no network and tells nobody anything,
|
||||
//! or, when turned on in Preferences, the street map from OpenFreeMap.
|
||||
//!
|
||||
//! The projection is Web Mercator, the one every other map uses, so the
|
||||
//! world looks the way people expect. Markers that would overlap on screen
|
||||
@@ -27,7 +27,7 @@ use std::time::{Duration, Instant};
|
||||
use gtk4::cairo;
|
||||
use pdfs_core::control::PhotoLocation;
|
||||
|
||||
use super::map_tiles::{self, Done, Label, LabelClass, Palette, TILE_EDGE, TileKey, Tiles};
|
||||
use super::map_tiles::{self, Done, Label, LabelClass, Palette, Source, TILE_EDGE, TileKey, Tiles};
|
||||
use crate::*;
|
||||
|
||||
const LAND: &str = include_str!("../../../data/land.txt");
|
||||
@@ -37,8 +37,8 @@ const BORDERS: &str = include_str!("../../../data/borders.txt");
|
||||
const MAX_LATITUDE: f64 = 85.0;
|
||||
|
||||
/// How far in the map zooms, as a multiple of the whole world fitting the
|
||||
/// widget: far enough for photos in one town to part on the built-in map,
|
||||
/// and down to single streets on the street map.
|
||||
/// widget: far enough for photos in one town to part on the outline and the
|
||||
/// basemap, and down to single streets on the street map.
|
||||
const MAX_ZOOM: f64 = 8192.0;
|
||||
const ONLINE_MAX_ZOOM: f64 = 65536.0;
|
||||
|
||||
@@ -66,7 +66,7 @@ const MIN_SEGMENT: f64 = 0.75;
|
||||
/// Edge in px of the square a marker's photo is scaled down to once.
|
||||
const COVER_PX: i32 = 128;
|
||||
|
||||
/// How many street-map tiles stay in memory.
|
||||
/// How many map tiles stay in memory.
|
||||
const TILE_CACHE: usize = 160;
|
||||
|
||||
/// Photo marker covers kept, 64 KiB each. A town's own cover is never
|
||||
@@ -190,7 +190,7 @@ struct Marker {
|
||||
target: Target,
|
||||
}
|
||||
|
||||
/// A street-map tile ready to draw, and the names on it.
|
||||
/// A map tile ready to draw, and the names on it.
|
||||
struct CachedTile {
|
||||
surface: cairo::ImageSurface,
|
||||
labels: Rc<Vec<Label>>,
|
||||
@@ -198,9 +198,11 @@ struct CachedTile {
|
||||
used: u64,
|
||||
}
|
||||
|
||||
/// The street map, while it is turned on.
|
||||
struct Online {
|
||||
/// The tiles drawn over the outline, from the basemap or the street map.
|
||||
struct TileLayer {
|
||||
tiles: Tiles,
|
||||
/// Whether they come from the street map.
|
||||
online: bool,
|
||||
cache: HashMap<TileKey, CachedTile>,
|
||||
pending: HashSet<TileKey>,
|
||||
failed: HashMap<TileKey, Instant>,
|
||||
@@ -239,7 +241,11 @@ struct MapState {
|
||||
drag_origin: Option<View>,
|
||||
/// The scale a pinch started from.
|
||||
pinch_origin: Option<View>,
|
||||
online: Option<Online>,
|
||||
tiles: Option<TileLayer>,
|
||||
/// Whether the street map is turned on in Preferences.
|
||||
street_map: bool,
|
||||
/// The installed basemap, if any.
|
||||
basemap: Option<PathBuf>,
|
||||
cache_dir: Option<PathBuf>,
|
||||
/// The spot [`PlacesMap::show_spot`] went to, ringed until the map is
|
||||
/// fitted to all places again.
|
||||
@@ -295,32 +301,11 @@ impl PlacesMap {
|
||||
buttons.append(&zoom);
|
||||
buttons.append(&fit);
|
||||
|
||||
let link = |url: &str, name: &str| format!("<a href=\"{url}\">{name}</a>");
|
||||
let credit = gtk4::Label::builder()
|
||||
.use_markup(true)
|
||||
.halign(gtk4::Align::End)
|
||||
.valign(gtk4::Align::End)
|
||||
.visible(false)
|
||||
.label(gettext_f(
|
||||
// Translators: the credit on the street map. {openfreemap},
|
||||
// {openmaptiles} and {openstreetmap} are the linked names of
|
||||
// the projects, which stay as they are.
|
||||
"{openfreemap} © {openmaptiles} Data from {openstreetmap}",
|
||||
&[
|
||||
(
|
||||
"openfreemap",
|
||||
&link("https://openfreemap.org", "OpenFreeMap"),
|
||||
),
|
||||
(
|
||||
"openmaptiles",
|
||||
&link("https://www.openmaptiles.org/", "OpenMapTiles"),
|
||||
),
|
||||
(
|
||||
"openstreetmap",
|
||||
&link("https://www.openstreetmap.org/copyright", "OpenStreetMap"),
|
||||
),
|
||||
],
|
||||
))
|
||||
.build();
|
||||
credit.add_css_class("places-map-credit");
|
||||
credit.add_css_class("caption");
|
||||
@@ -354,7 +339,9 @@ impl PlacesMap {
|
||||
pointer: (0.0, 0.0),
|
||||
drag_origin: None,
|
||||
pinch_origin: None,
|
||||
online: None,
|
||||
tiles: None,
|
||||
street_map: false,
|
||||
basemap: map_tiles::find_basemap(),
|
||||
cache_dir: None,
|
||||
pin: None,
|
||||
}),
|
||||
@@ -494,39 +481,53 @@ impl PlacesMap {
|
||||
self.area.queue_draw();
|
||||
}
|
||||
|
||||
/// Draw OpenFreeMap's street map under the markers, or stop, keeping its
|
||||
/// tiles in `cache_dir`.
|
||||
/// Draw OpenFreeMap's street map under the markers, keeping its tiles in
|
||||
/// `cache_dir`, or else the installed basemap.
|
||||
pub(crate) fn set_online(self: &Rc<Self>, on: bool, cache_dir: PathBuf) {
|
||||
{
|
||||
let mut state = self.state.borrow_mut();
|
||||
state.cache_dir = Some(cache_dir);
|
||||
if on == state.online.is_some() {
|
||||
let started = state.tiles.is_some() || state.basemap.is_none();
|
||||
if on == state.street_map && started {
|
||||
return;
|
||||
}
|
||||
state.online = None;
|
||||
}
|
||||
self.credit.set_visible(on);
|
||||
if on {
|
||||
self.start_tiles();
|
||||
state.street_map = on;
|
||||
state.tiles = None;
|
||||
}
|
||||
self.start_tiles();
|
||||
self.clamp_zoom();
|
||||
self.area.queue_draw();
|
||||
}
|
||||
|
||||
/// Start a tile worker for the widget's current pixel density.
|
||||
/// Start a tile worker for the widget's current pixel density, and show
|
||||
/// the credit for what it draws.
|
||||
fn start_tiles(self: &Rc<Self>) {
|
||||
let Some(dir) = self.state.borrow().cache_dir.clone() else {
|
||||
let source = {
|
||||
let state = self.state.borrow();
|
||||
match (&state.cache_dir, &state.basemap) {
|
||||
(Some(dir), _) if state.street_map => {
|
||||
let language = gtk4::pango::Language::default().to_string();
|
||||
let language = language.split(['-', '_']).next().unwrap_or("en").to_owned();
|
||||
Some(Source::Online {
|
||||
cache_dir: dir.join("map-tiles"),
|
||||
language,
|
||||
})
|
||||
}
|
||||
(_, Some(basemap)) => Some(Source::Offline(basemap.clone())),
|
||||
_ => None,
|
||||
}
|
||||
};
|
||||
let Some(source) = source else {
|
||||
self.credit.set_visible(false);
|
||||
return;
|
||||
};
|
||||
let language = gtk4::pango::Language::default().to_string();
|
||||
let language = language.split(['-', '_']).next().unwrap_or("en").to_owned();
|
||||
let (tiles, done) = Tiles::start(
|
||||
dir.join("map-tiles"),
|
||||
language,
|
||||
self.area.scale_factor().max(1),
|
||||
);
|
||||
self.state.borrow_mut().online = Some(Online {
|
||||
let online = matches!(source, Source::Online { .. });
|
||||
self.credit.set_label(&credit_text(online));
|
||||
self.credit.set_visible(true);
|
||||
let (tiles, done) = Tiles::start(source, self.area.scale_factor().max(1));
|
||||
self.state.borrow_mut().tiles = Some(TileLayer {
|
||||
tiles,
|
||||
online,
|
||||
cache: HashMap::new(),
|
||||
pending: HashSet::new(),
|
||||
failed: HashMap::new(),
|
||||
@@ -546,7 +547,7 @@ impl PlacesMap {
|
||||
|
||||
fn tile_done(&self, done: Done) {
|
||||
let mut state = self.state.borrow_mut();
|
||||
let Some(online) = state.online.as_mut() else {
|
||||
let Some(online) = state.tiles.as_mut() else {
|
||||
return;
|
||||
};
|
||||
match done {
|
||||
@@ -732,7 +733,7 @@ impl PlacesMap {
|
||||
}
|
||||
|
||||
fn max_scale(&self) -> f64 {
|
||||
let zoom = if self.state.borrow().online.is_some() {
|
||||
let zoom = if self.state.borrow().tiles.as_ref().is_some_and(|t| t.online) {
|
||||
ONLINE_MAX_ZOOM
|
||||
} else {
|
||||
MAX_ZOOM
|
||||
@@ -827,11 +828,11 @@ impl PlacesMap {
|
||||
let restart = self
|
||||
.state
|
||||
.borrow()
|
||||
.online
|
||||
.tiles
|
||||
.as_ref()
|
||||
.is_some_and(|o| o.tiles.scale != area.scale_factor().max(1));
|
||||
if restart {
|
||||
self.state.borrow_mut().online = None;
|
||||
self.state.borrow_mut().tiles = None;
|
||||
self.start_tiles();
|
||||
}
|
||||
|
||||
@@ -846,7 +847,7 @@ impl PlacesMap {
|
||||
let view = state.view;
|
||||
state.draws += 1;
|
||||
paint_outline(cr, view, size, colors);
|
||||
let labels = match state.online.as_mut() {
|
||||
let labels = match state.tiles.as_mut() {
|
||||
Some(online) => paint_tiles(cr, online, view, size, dark, area.scale_factor()),
|
||||
None => Vec::new(),
|
||||
};
|
||||
@@ -999,16 +1000,16 @@ fn paint_outline(cr: &cairo::Context, view: View, size: (f64, f64), colors: &Pal
|
||||
let _ = cr.stroke();
|
||||
}
|
||||
|
||||
/// The street-map zoom whose tiles come closest to their own size on screen.
|
||||
/// The tile zoom whose tiles come closest to their own size on screen.
|
||||
fn tile_zoom(scale: f64) -> u8 {
|
||||
(scale / TILE_EDGE).log2().round().clamp(0.0, 18.0) as u8
|
||||
}
|
||||
|
||||
/// Draw the street-map tiles on screen, asking for the missing ones and
|
||||
/// standing in their nearest ancestor meanwhile. Returns the names on them.
|
||||
/// Draw the map tiles on screen, asking for the missing ones and standing in
|
||||
/// their nearest ancestor meanwhile. Returns the names on them.
|
||||
fn paint_tiles(
|
||||
cr: &cairo::Context,
|
||||
online: &mut Online,
|
||||
online: &mut TileLayer,
|
||||
view: View,
|
||||
size: (f64, f64),
|
||||
dark: bool,
|
||||
@@ -1565,6 +1566,47 @@ impl PlacesMap {
|
||||
/// How many town names a merged marker's tooltip lists.
|
||||
const TOOLTIP_NAMES: usize = 5;
|
||||
|
||||
/// The credit for the map's tiles, as Pango markup.
|
||||
fn credit_text(online: bool) -> String {
|
||||
let link = |url: &str, name: &str| format!("<a href=\"{url}\">{name}</a>");
|
||||
if online {
|
||||
gettext_f(
|
||||
// Translators: the credit on the street map. {openfreemap},
|
||||
// {openmaptiles} and {openstreetmap} are the linked names of
|
||||
// the projects, which stay as they are.
|
||||
"{openfreemap} © {openmaptiles} Data from {openstreetmap}",
|
||||
&[
|
||||
(
|
||||
"openfreemap",
|
||||
&link("https://openfreemap.org", "OpenFreeMap"),
|
||||
),
|
||||
(
|
||||
"openmaptiles",
|
||||
&link("https://www.openmaptiles.org/", "OpenMapTiles"),
|
||||
),
|
||||
(
|
||||
"openstreetmap",
|
||||
&link("https://www.openstreetmap.org/copyright", "OpenStreetMap"),
|
||||
),
|
||||
],
|
||||
)
|
||||
} else {
|
||||
gettext_f(
|
||||
// Translators: the credit on the offline map. {naturalearth} and
|
||||
// {geonames} are the linked names of the projects, which stay as
|
||||
// they are.
|
||||
"Map data © {naturalearth} (public domain) and {geonames} (CC BY 4.0)",
|
||||
&[
|
||||
(
|
||||
"naturalearth",
|
||||
&link("https://www.naturalearthdata.com/", "Natural Earth"),
|
||||
),
|
||||
("geonames", &link("https://www.geonames.org/", "GeoNames")),
|
||||
],
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
fn map_button(icon: &str, tooltip: &str) -> gtk4::Button {
|
||||
let button = gtk4::Button::from_icon_name(icon);
|
||||
button.set_tooltip_text(Some(tooltip));
|
||||
|
||||
@@ -245,7 +245,7 @@ pub(crate) fn build_main_page() -> MainWidgets {
|
||||
let online_map_row = adw::SwitchRow::builder()
|
||||
.title(gettext("Street map for Places"))
|
||||
.subtitle(gettext(
|
||||
"Show streets and town names from OpenFreeMap. It learns which parts of the world you look at.",
|
||||
"Show streets from OpenFreeMap instead of the offline map. It learns which parts of the world you look at.",
|
||||
))
|
||||
.build();
|
||||
appearance_group.add(&online_map_row);
|
||||
|
||||
@@ -23,6 +23,12 @@ scratch (user data in `staging/` and `recovery/` is never touched by this).
|
||||
|
||||
### Changed
|
||||
|
||||
- The Places map draws an offline basemap, the one Proton Gallery shows: seas by
|
||||
depth, lakes, rivers, built-up areas, borders and town names, in light and dark,
|
||||
rendered in the background through `proton-map-rs`. It ships with every package
|
||||
(about 25 MB, fetched by `scripts/fetch-basemap.sh` against a pinned SHA-256) and
|
||||
sends no request. The street map stays opt-in and replaces it when turned on.
|
||||
Without the file the map falls back to the coarse outlines.
|
||||
- A Google Photos import uploads two photos at once instead of one, while the next
|
||||
photo is read out of its archive. Live-photo videos still go after their stills, and
|
||||
cancelling still lets the uploads in flight finish.
|
||||
|
||||
@@ -360,8 +360,12 @@ git clone https://github.com/narrrl/proton-drive-linux.git
|
||||
cd proton-drive-linux
|
||||
cargo build --release --locked
|
||||
po/build.sh target/locale # optional: compile the translations
|
||||
scripts/fetch-basemap.sh # optional: the offline Places map, into data/
|
||||
```
|
||||
|
||||
Install `data/basemap-v1.pmtiles` as `~/.local/share/proton-drive-linux/basemap-v1.pmtiles`, or
|
||||
point `PDFS_BASEMAP` at it. Without it Places shows coarse outlines only.
|
||||
|
||||
The four programs are in `target/release/`: `pdfs`, `pdfs-app`, `pdfs-tray` and `pdfs-prompt`.
|
||||
|
||||
### Build a package from the working tree
|
||||
@@ -376,6 +380,7 @@ cd packaging && makepkg -fi
|
||||
|
||||
```bash
|
||||
sudo dnf install -y rpm-build
|
||||
scripts/fetch-basemap.sh
|
||||
rpmbuild -bb packaging/proton-drive-linux.spec \
|
||||
--define "git_dir $PWD" \
|
||||
--define "_rpmdir $PWD/packaging/out" \
|
||||
|
||||
+6
-3
@@ -68,11 +68,14 @@ albums, and add or remove photos. Deleting an album keeps its photos in the time
|
||||
|
||||
**Places** groups photos by the town they were taken in, as cards or on a map. Town names come
|
||||
from [GeoNames](https://www.geonames.org/) data (CC BY 4.0) and the map from
|
||||
[Natural Earth](https://www.naturalearthdata.com/) (public domain). Both ship with the app, so
|
||||
nothing is fetched online.
|
||||
[Natural Earth](https://www.naturalearthdata.com/) (public domain): seas by depth, lakes, rivers,
|
||||
built-up areas, borders and town names, in light and dark. Both ship with the app as
|
||||
`/usr/share/proton-drive-linux/basemap-v1.pmtiles`, so nothing is fetched online. Without that file,
|
||||
for example in a build from source that skipped `scripts/fetch-basemap.sh`, the map shows coarse
|
||||
land outlines only. `PDFS_BASEMAP` points the app at another copy.
|
||||
|
||||
A street map from [OpenFreeMap](https://openfreemap.org/) (© OpenStreetMap contributors) can be
|
||||
turned on under **Preferences → General → Appearance**. It is off by default, because the map
|
||||
turned on instead under **Preferences → General → Appearance**. It is off by default, because the map
|
||||
server learns which areas you look at.
|
||||
|
||||
## Viewer and duplicates
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 283 KiB After Width: | Height: | Size: 702 KiB |
+5
-1
@@ -16,7 +16,7 @@ arch=('x86_64')
|
||||
url="https://proton-drive.narl.io"
|
||||
license=('MIT')
|
||||
depends=('fuse3' 'polkit' 'gtk4' 'libadwaita' 'webkitgtk-6.0' 'perl-image-exiftool')
|
||||
makedepends=('cargo' 'git' 'gettext')
|
||||
makedepends=('cargo' 'git' 'gettext' 'curl')
|
||||
provides=('pdfs')
|
||||
# Files-on-demand mount + keyring need these at runtime.
|
||||
optdepends=('gnome-keyring: credential storage via Secret Service'
|
||||
@@ -80,6 +80,10 @@ package() {
|
||||
install -Dm644 "packaging/io.narl.proton-drive-linux.policy" \
|
||||
"$pkgdir/usr/share/polkit-1/actions/io.narl.proton-drive-linux.policy"
|
||||
|
||||
# The offline Places basemap, fetched and checked against its pinned
|
||||
# SHA-256 by scripts/fetch-basemap.sh.
|
||||
scripts/fetch-basemap.sh "$pkgdir/usr/share/proton-drive-linux/basemap-v1.pmtiles"
|
||||
|
||||
# Translations: compiled from po/ into /usr/share/locale.
|
||||
po/build.sh "$pkgdir/usr/share/locale"
|
||||
|
||||
|
||||
@@ -49,6 +49,10 @@ package() {
|
||||
install -Dm644 lib/systemd/user/proton-drive.service \
|
||||
"$pkgdir/usr/lib/systemd/user/proton-drive.service"
|
||||
|
||||
# The offline Places basemap.
|
||||
install -Dm644 share/proton-drive-linux/basemap-v1.pmtiles \
|
||||
"$pkgdir/usr/share/proton-drive-linux/basemap-v1.pmtiles"
|
||||
|
||||
# Translations and shell completion for bash, zsh and fish.
|
||||
install -dm755 "$pkgdir/usr/share"
|
||||
cp -r --no-preserve=ownership share/locale share/bash-completion share/zsh share/fish \
|
||||
|
||||
@@ -25,8 +25,10 @@ conflicts=('proton-drive-linux' 'proton-drive-for-linux' 'proton-drive-for-linux
|
||||
options=('!lto')
|
||||
# Stops the running daemon before removal, so the mount stops mirroring deletes.
|
||||
install=proton-drive.install
|
||||
source=("$pkgname::git+$_repo.git")
|
||||
sha256sums=('SKIP')
|
||||
source=("$pkgname::git+$_repo.git"
|
||||
"basemap-v1.pmtiles::https://github.com/narrrl/proton-rs/releases/download/basemap-v1/basemap-v1.pmtiles")
|
||||
sha256sums=('SKIP'
|
||||
'ce9acab1b7ed7f15b23e2365b1b6a580db79f4bc4421851ee673eff4c920d280')
|
||||
|
||||
pkgver() {
|
||||
cd "$pkgname"
|
||||
@@ -81,6 +83,10 @@ package() {
|
||||
install -Dm644 "packaging/io.narl.proton-drive-linux.policy" \
|
||||
"$pkgdir/usr/share/polkit-1/actions/io.narl.proton-drive-linux.policy"
|
||||
|
||||
# The offline Places basemap.
|
||||
install -Dm644 "$srcdir/basemap-v1.pmtiles" \
|
||||
"$pkgdir/usr/share/proton-drive-linux/basemap-v1.pmtiles"
|
||||
|
||||
# Translations: compiled from po/ into /usr/share/locale.
|
||||
po/build.sh "$pkgdir/usr/share/locale"
|
||||
|
||||
|
||||
@@ -25,8 +25,10 @@ conflicts=('proton-drive-linux' 'proton-drive-for-linux-bin' 'proton-drive-for-l
|
||||
options=('!lto')
|
||||
# Stops the running daemon before removal, so the mount stops mirroring deletes.
|
||||
install=proton-drive.install
|
||||
source=("$pkgname-$pkgver.tar.gz::$_repo/archive/refs/tags/v$pkgver.tar.gz")
|
||||
sha256sums=('095186fa108f27ff2b175188bb13466a94cc8ecfd71088df47a41d4d9baa58c1')
|
||||
source=("$pkgname-$pkgver.tar.gz::$_repo/archive/refs/tags/v$pkgver.tar.gz"
|
||||
"basemap-v1.pmtiles::https://github.com/narrrl/proton-rs/releases/download/basemap-v1/basemap-v1.pmtiles")
|
||||
sha256sums=('095186fa108f27ff2b175188bb13466a94cc8ecfd71088df47a41d4d9baa58c1'
|
||||
'ce9acab1b7ed7f15b23e2365b1b6a580db79f4bc4421851ee673eff4c920d280')
|
||||
|
||||
_srcname="proton-drive-linux-$pkgver"
|
||||
|
||||
@@ -76,6 +78,10 @@ package() {
|
||||
install -Dm644 "packaging/io.narl.proton-drive-linux.policy" \
|
||||
"$pkgdir/usr/share/polkit-1/actions/io.narl.proton-drive-linux.policy"
|
||||
|
||||
# The offline Places basemap.
|
||||
install -Dm644 "$srcdir/basemap-v1.pmtiles" \
|
||||
"$pkgdir/usr/share/proton-drive-linux/basemap-v1.pmtiles"
|
||||
|
||||
# Translations: compiled from po/ into /usr/share/locale.
|
||||
po/build.sh "$pkgdir/usr/share/locale"
|
||||
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchurl,
|
||||
adwaita-icon-theme,
|
||||
pkg-config,
|
||||
gettext,
|
||||
@@ -23,6 +24,11 @@
|
||||
|
||||
let
|
||||
cargoToml = lib.importTOML ../../Cargo.toml;
|
||||
# The offline Places basemap, as scripts/fetch-basemap.sh pins it.
|
||||
basemap = fetchurl {
|
||||
url = "https://github.com/narrrl/proton-rs/releases/download/basemap-v1/basemap-v1.pmtiles";
|
||||
sha256 = "ce9acab1b7ed7f15b23e2365b1b6a580db79f4bc4421851ee673eff4c920d280";
|
||||
};
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "proton-drive-linux";
|
||||
@@ -116,6 +122,7 @@ rustPlatform.buildRustPackage {
|
||||
packaging/completions.sh $out/bin/pdfs $out/share
|
||||
|
||||
# Nix brings new releases, so the app never checks for them itself.
|
||||
install -Dm644 ${basemap} $out/share/proton-drive-linux/basemap-v1.pmtiles
|
||||
install -Dm644 /dev/null $out/share/proton-drive-linux/managed-updates
|
||||
'';
|
||||
|
||||
|
||||
@@ -25,7 +25,10 @@ ExclusiveArch: x86_64
|
||||
%if 0%{!?git_dir:1}
|
||||
Source0: %{forge}/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||
Source1: %{forge}/releases/download/v%{version}/%{name}-vendor-%{version}.tar.xz
|
||||
# The offline Places basemap, checked against its pinned SHA-256 in %%prep.
|
||||
Source2: https://github.com/narrrl/proton-rs/releases/download/basemap-v1/basemap-v1.pmtiles
|
||||
%endif
|
||||
%global basemap_sha256 ce9acab1b7ed7f15b23e2365b1b6a580db79f4bc4421851ee673eff4c920d280
|
||||
|
||||
BuildRequires: cargo
|
||||
BuildRequires: rust >= 1.96
|
||||
@@ -75,6 +78,7 @@ cp -a %{git_dir}/LICENSE .
|
||||
%else
|
||||
# -a 1 unpacks the vendored crates and their source mappings.
|
||||
%autosetup -n %{name}-%{version} -a 1
|
||||
echo "%{basemap_sha256} %{SOURCE2}" | sha256sum --check --quiet
|
||||
# Older vendor tarballs contained only crates.io dependencies.
|
||||
if [ ! -f .cargo/config.toml ]; then
|
||||
mkdir -p .cargo
|
||||
@@ -119,6 +123,14 @@ install -D -m0644 %{src}/packaging/io.narl.proton-drive-linux.policy \
|
||||
%{buildroot}/usr/share/polkit-1/actions/io.narl.proton-drive-linux.policy
|
||||
install -D -m0644 %{src}/packaging/proton-drive.service \
|
||||
%{buildroot}/usr/lib/systemd/user/proton-drive.service
|
||||
%if 0%{?git_dir:1}
|
||||
# scripts/fetch-basemap.sh puts it here for in-tree builds.
|
||||
basemap=%{git_dir}/data/basemap-v1.pmtiles
|
||||
%else
|
||||
basemap=%{SOURCE2}
|
||||
%endif
|
||||
echo "%{basemap_sha256} $basemap" | sha256sum --check --quiet
|
||||
install -D -m0644 "$basemap" %{buildroot}%{_datadir}/proton-drive-linux/basemap-v1.pmtiles
|
||||
%{src}/po/build.sh %{buildroot}%{_datadir}/locale
|
||||
%{src}/packaging/completions.sh "$rel/pdfs" %{buildroot}%{_datadir}
|
||||
%if 0%{!?git_dir:1}
|
||||
@@ -160,6 +172,8 @@ fi
|
||||
%{_datadir}/bash-completion/completions/pdfs
|
||||
%{_datadir}/zsh/site-functions/_pdfs
|
||||
%{_datadir}/fish/vendor_completions.d/pdfs.fish
|
||||
%dir %{_datadir}/proton-drive-linux
|
||||
%{_datadir}/proton-drive-linux/basemap-v1.pmtiles
|
||||
%if 0%{!?git_dir:1}
|
||||
%{_datadir}/proton-drive-linux/managed-updates
|
||||
%endif
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#!/usr/bin/env bash
|
||||
# Lay out the release tarball: built binaries, desktop files, icon, user
|
||||
# service, translations, shell completions and install.sh, under one top-level
|
||||
# service, the Places basemap, translations, shell completions and install.sh, under one top-level
|
||||
# directory with a /usr-like tree, then pack it.
|
||||
#
|
||||
# usage: packaging/tarball/build.sh <binary dir> <version> <output dir>
|
||||
@@ -37,6 +37,11 @@ install -Dm644 "$repo/packaging/io.narl.proton-drive-linux.policy" \
|
||||
install -Dm644 "$repo/packaging/proton-drive.service" \
|
||||
"$root/lib/systemd/user/proton-drive.service"
|
||||
install -Dm644 "$repo/LICENSE" "$root/share/licenses/proton-drive-linux/LICENSE"
|
||||
# The offline Places basemap, fetched once into data/ and checked against
|
||||
# its pinned SHA-256.
|
||||
"$repo/scripts/fetch-basemap.sh"
|
||||
install -Dm644 "$repo/data/basemap-v1.pmtiles" \
|
||||
"$root/share/proton-drive-linux/basemap-v1.pmtiles"
|
||||
"$repo/po/build.sh" "$root/share/locale"
|
||||
"$repo/packaging/completions.sh" "$root/bin/pdfs" "$root/share"
|
||||
install -Dm755 "$repo/packaging/tarball/install.sh" "$root/install.sh"
|
||||
|
||||
@@ -40,6 +40,7 @@ grep -qx "ExecStart=\"$prefix/bin/pdfs\" daemon" "$unit" || fail "ExecStart= was
|
||||
[ -f "$prefix/share/locale/de/LC_MESSAGES/pdfs.mo" ] || fail "no translations"
|
||||
[ -f "$prefix/share/icons/hicolor/scalable/apps/io.narl.proton-drive-linux.svg" ] || fail "no icon"
|
||||
[ -f "$prefix/share/bash-completion/completions/pdfs" ] || fail "no bash completion"
|
||||
[ -f "$prefix/share/proton-drive-linux/basemap-v1.pmtiles" ] || fail "no Places basemap"
|
||||
[ ! -e "$prefix/share/proton-drive-linux/managed-updates" ] || fail "the update check must stay on offer"
|
||||
uninstaller="$prefix/share/proton-drive-linux/install.sh"
|
||||
[ -x "$uninstaller" ] || fail "install.sh was not kept for --uninstall"
|
||||
|
||||
@@ -5,7 +5,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: proton-drive-linux 2.1.0\n"
|
||||
"Report-Msgid-Bugs-To: https://github.com/narrrl/proton-drive-linux/issues\n"
|
||||
"POT-Creation-Date: 2026-11-21 23:13+0100\n"
|
||||
"POT-Creation-Date: 2026-11-22 00:24+0100\n"
|
||||
"PO-Revision-Date: 2026-09-23 12:00+0200\n"
|
||||
"Last-Translator: Proton Drive for Linux contributors\n"
|
||||
"Language-Team: German\n"
|
||||
@@ -211,12 +211,11 @@ msgstr ""
|
||||
#: crates/pdfs-gui/src/app/main.rs:1479
|
||||
msgid ""
|
||||
"The places map is drawn from <a href=\"https://www.naturalearthdata.com/"
|
||||
"\">Natural Earth</a> land outlines and country borders, which are in the "
|
||||
"public domain."
|
||||
"\">Natural Earth</a> land, water and borders, which are in the public domain."
|
||||
msgstr ""
|
||||
"Die Ortskarte wird aus den Landumrissen und Ländergrenzen von <a "
|
||||
"href=\"https://www.naturalearthdata.com/\">Natural Earth</a> gezeichnet, die "
|
||||
"gemeinfrei sind."
|
||||
"Die Ortskarte wird aus Land, Gewässern und Grenzen von <a href=\"https://"
|
||||
"www.naturalearthdata.com/\">Natural Earth</a> gezeichnet, die gemeinfrei "
|
||||
"sind."
|
||||
|
||||
#: crates/pdfs-gui/src/app/main.rs:1487
|
||||
msgid ""
|
||||
@@ -1573,7 +1572,7 @@ msgstr[1] "{n} Fotos · mit mir geteilt"
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/albums.rs:608
|
||||
#: crates/pdfs-gui/src/app/pages/places.rs:307
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:1554
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:1555
|
||||
#, rust-format
|
||||
msgid "{n} photo"
|
||||
msgid_plural "{n} photos"
|
||||
@@ -3828,7 +3827,6 @@ msgstr "Authentifizierungscode"
|
||||
msgid "Confirm"
|
||||
msgstr "Bestätigen"
|
||||
|
||||
#
|
||||
#: crates/pdfs-gui/src/app/pages/login.rs:629
|
||||
msgid "Verify in Your Browser"
|
||||
msgstr "Im Browser überprüfen"
|
||||
@@ -3842,12 +3840,10 @@ msgstr ""
|
||||
"werden. Öffne sie in deinem Browser, schließe sie dort ab, komm dann zurück "
|
||||
"und wähle „Weiter“."
|
||||
|
||||
#
|
||||
#: crates/pdfs-gui/src/app/pages/login.rs:637
|
||||
msgid "Open Verification Page"
|
||||
msgstr "Überprüfungsseite öffnen"
|
||||
|
||||
#
|
||||
#: crates/pdfs-gui/src/app/pages/login.rs:644
|
||||
msgid "Continue"
|
||||
msgstr "Weiter"
|
||||
@@ -3869,8 +3865,12 @@ msgid ""
|
||||
msgid_plural ""
|
||||
"{n} changes are not on Proton Drive yet. They stay on this computer and are "
|
||||
"sent after you sign in again."
|
||||
msgstr[0] "{n} Änderung ist noch nicht auf Proton Drive. Sie bleibt auf diesem Computer und wird gesendet, sobald Sie sich wieder anmelden."
|
||||
msgstr[1] "{n} Änderungen sind noch nicht auf Proton Drive. Sie bleiben auf diesem Computer und werden gesendet, sobald Sie sich wieder anmelden."
|
||||
msgstr[0] ""
|
||||
"{n} Änderung ist noch nicht auf Proton Drive. Sie bleibt auf diesem Computer "
|
||||
"und wird gesendet, sobald Sie sich wieder anmelden."
|
||||
msgstr[1] ""
|
||||
"{n} Änderungen sind noch nicht auf Proton Drive. Sie bleiben auf diesem "
|
||||
"Computer und werden gesendet, sobald Sie sich wieder anmelden."
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/login.rs:715
|
||||
msgid "Sign Out?"
|
||||
@@ -4634,26 +4634,34 @@ msgid_plural "{country} · {n} photos"
|
||||
msgstr[0] "{country} · {n} Foto"
|
||||
msgstr[1] "{country} · {n} Fotos"
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:283
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:289
|
||||
msgid "Zoom In"
|
||||
msgstr "Vergrößern"
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:284
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:290
|
||||
msgid "Zoom Out"
|
||||
msgstr "Verkleinern"
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:285
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:291
|
||||
msgid "Show All Places"
|
||||
msgstr "Alle Orte zeigen"
|
||||
|
||||
#. Translators: the credit on the street map. {openfreemap},
|
||||
#. {openmaptiles} and {openstreetmap} are the linked names of
|
||||
#. the projects, which stay as they are.
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:308
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:1577
|
||||
#, rust-format
|
||||
msgid "{openfreemap} © {openmaptiles} Data from {openstreetmap}"
|
||||
msgstr "{openfreemap} © {openmaptiles} Daten von {openstreetmap}"
|
||||
|
||||
#. Translators: the credit on the offline map. {naturalearth} and
|
||||
#. {geonames} are the linked names of the projects, which stay as
|
||||
#. they are.
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:1598
|
||||
#, rust-format
|
||||
msgid "Map data © {naturalearth} (public domain) and {geonames} (CC BY 4.0)"
|
||||
msgstr "Kartendaten © {naturalearth} (gemeinfrei) und {geonames} (CC BY 4.0)"
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/preferences_apps.rs:35
|
||||
msgid "Text"
|
||||
msgstr "Text"
|
||||
@@ -5457,11 +5465,11 @@ msgstr "Straßenkarte für Orte"
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/status.rs:248
|
||||
msgid ""
|
||||
"Show streets and town names from OpenFreeMap. It learns which parts of the "
|
||||
"world you look at."
|
||||
"Show streets from OpenFreeMap instead of the offline map. It learns which "
|
||||
"parts of the world you look at."
|
||||
msgstr ""
|
||||
"Straßen und Ortsnamen von OpenFreeMap anzeigen. OpenFreeMap erfährt dabei, "
|
||||
"welche Teile der Welt angesehen werden."
|
||||
"Straßen von OpenFreeMap statt der Offline-Karte anzeigen. OpenFreeMap "
|
||||
"erfährt dabei, welche Teile der Welt angesehen werden."
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/status.rs:253
|
||||
msgid "Show tray icon"
|
||||
@@ -7541,8 +7549,6 @@ msgstr "Proton-Drive-Hintergrunddienst nicht erreichbar: {error}"
|
||||
#~ msgstr "Galerien aktualisieren"
|
||||
|
||||
#, fuzzy
|
||||
#~| msgctxt "verb"
|
||||
#~| msgid "Resume"
|
||||
#~ msgid "Resume"
|
||||
#~ msgstr "Fortsetzen"
|
||||
|
||||
@@ -7864,7 +7870,5 @@ msgstr "Proton-Drive-Hintergrunddienst nicht erreichbar: {error}"
|
||||
#~ msgstr "Die Akzentfarbe konnte nicht gespeichert werden"
|
||||
|
||||
#, fuzzy
|
||||
#~| msgctxt "layout"
|
||||
#~| msgid "Grid"
|
||||
#~ msgid "Grid"
|
||||
#~ msgstr "Raster"
|
||||
+26
-23
@@ -5,7 +5,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: proton-drive-linux 2.1.0\n"
|
||||
"Report-Msgid-Bugs-To: https://github.com/narrrl/proton-drive-linux/issues\n"
|
||||
"POT-Creation-Date: 2026-11-21 23:13+0100\n"
|
||||
"POT-Creation-Date: 2026-11-22 00:24+0100\n"
|
||||
"PO-Revision-Date: 2026-09-23 12:00+0200\n"
|
||||
"Last-Translator: Proton Drive for Linux contributors\n"
|
||||
"Language-Team: English (United Kingdom)\n"
|
||||
@@ -208,12 +208,10 @@ msgstr ""
|
||||
#: crates/pdfs-gui/src/app/main.rs:1479
|
||||
msgid ""
|
||||
"The places map is drawn from <a href=\"https://www.naturalearthdata.com/"
|
||||
"\">Natural Earth</a> land outlines and country borders, which are in the "
|
||||
"public domain."
|
||||
"\">Natural Earth</a> land, water and borders, which are in the public domain."
|
||||
msgstr ""
|
||||
"The places map is drawn from <a href=\"https://www.naturalearthdata.com/"
|
||||
"\">Natural Earth</a> land outlines and country borders, which are in the "
|
||||
"public domain."
|
||||
"\">Natural Earth</a> land, water and borders, which are in the public domain."
|
||||
|
||||
#: crates/pdfs-gui/src/app/main.rs:1487
|
||||
msgid ""
|
||||
@@ -1560,7 +1558,7 @@ msgstr[1] "{n} photos · shared with me"
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/albums.rs:608
|
||||
#: crates/pdfs-gui/src/app/pages/places.rs:307
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:1554
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:1555
|
||||
#, rust-format
|
||||
msgid "{n} photo"
|
||||
msgid_plural "{n} photos"
|
||||
@@ -3761,7 +3759,6 @@ msgstr "Authentication code"
|
||||
msgid "Confirm"
|
||||
msgstr "Confirm"
|
||||
|
||||
#
|
||||
#: crates/pdfs-gui/src/app/pages/login.rs:629
|
||||
msgid "Verify in Your Browser"
|
||||
msgstr "Verify in Your Browser"
|
||||
@@ -3774,12 +3771,10 @@ msgstr ""
|
||||
"The verification page can't be shown in the app on this system. Open it in "
|
||||
"your browser, complete it there, then come back and choose Continue."
|
||||
|
||||
#
|
||||
#: crates/pdfs-gui/src/app/pages/login.rs:637
|
||||
msgid "Open Verification Page"
|
||||
msgstr "Open Verification Page"
|
||||
|
||||
#
|
||||
#: crates/pdfs-gui/src/app/pages/login.rs:644
|
||||
msgid "Continue"
|
||||
msgstr "Continue"
|
||||
@@ -3800,8 +3795,12 @@ msgid ""
|
||||
msgid_plural ""
|
||||
"{n} changes are not on Proton Drive yet. They stay on this computer and are "
|
||||
"sent after you sign in again."
|
||||
msgstr[0] "{n} change is not on Proton Drive yet. It stays on this computer and is sent after you sign in again."
|
||||
msgstr[1] "{n} changes are not on Proton Drive yet. They stay on this computer and are sent after you sign in again."
|
||||
msgstr[0] ""
|
||||
"{n} change is not on Proton Drive yet. It stays on this computer and is sent "
|
||||
"after you sign in again."
|
||||
msgstr[1] ""
|
||||
"{n} changes are not on Proton Drive yet. They stay on this computer and are "
|
||||
"sent after you sign in again."
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/login.rs:715
|
||||
msgid "Sign Out?"
|
||||
@@ -4555,26 +4554,34 @@ msgid_plural "{country} · {n} photos"
|
||||
msgstr[0] "{country} · {n} photo"
|
||||
msgstr[1] "{country} · {n} photos"
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:283
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:289
|
||||
msgid "Zoom In"
|
||||
msgstr "Zoom In"
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:284
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:290
|
||||
msgid "Zoom Out"
|
||||
msgstr "Zoom Out"
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:285
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:291
|
||||
msgid "Show All Places"
|
||||
msgstr "Show All Places"
|
||||
|
||||
#. Translators: the credit on the street map. {openfreemap},
|
||||
#. {openmaptiles} and {openstreetmap} are the linked names of
|
||||
#. the projects, which stay as they are.
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:308
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:1577
|
||||
#, rust-format
|
||||
msgid "{openfreemap} © {openmaptiles} Data from {openstreetmap}"
|
||||
msgstr "{openfreemap} © {openmaptiles} Data from {openstreetmap}"
|
||||
|
||||
#. Translators: the credit on the offline map. {naturalearth} and
|
||||
#. {geonames} are the linked names of the projects, which stay as
|
||||
#. they are.
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:1598
|
||||
#, rust-format
|
||||
msgid "Map data © {naturalearth} (public domain) and {geonames} (CC BY 4.0)"
|
||||
msgstr "Map data © {naturalearth} (public domain) and {geonames} (CC BY 4.0)"
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/preferences_apps.rs:35
|
||||
msgid "Text"
|
||||
msgstr "Text"
|
||||
@@ -5362,11 +5369,11 @@ msgstr "Street map for Places"
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/status.rs:248
|
||||
msgid ""
|
||||
"Show streets and town names from OpenFreeMap. It learns which parts of the "
|
||||
"world you look at."
|
||||
"Show streets from OpenFreeMap instead of the offline map. It learns which "
|
||||
"parts of the world you look at."
|
||||
msgstr ""
|
||||
"Show streets and town names from OpenFreeMap. It learns which parts of the "
|
||||
"world you look at."
|
||||
"Show streets from OpenFreeMap instead of the offline map. It learns which "
|
||||
"parts of the world you look at."
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/status.rs:253
|
||||
msgid "Show tray icon"
|
||||
@@ -7402,8 +7409,6 @@ msgstr "cannot reach the Proton Drive daemon: {error}"
|
||||
#~ msgstr "Refresh galleries"
|
||||
|
||||
#, fuzzy
|
||||
#~| msgctxt "verb"
|
||||
#~| msgid "Resume"
|
||||
#~ msgid "Resume"
|
||||
#~ msgstr "Resume"
|
||||
|
||||
@@ -7717,7 +7722,5 @@ msgstr "cannot reach the Proton Drive daemon: {error}"
|
||||
#~ msgstr "Couldn't save the accent colour"
|
||||
|
||||
#, fuzzy
|
||||
#~| msgctxt "layout"
|
||||
#~| msgid "Grid"
|
||||
#~ msgid "Grid"
|
||||
#~ msgstr "Grid"
|
||||
@@ -5,7 +5,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: proton-drive-linux 2.1.0\n"
|
||||
"Report-Msgid-Bugs-To: https://github.com/narrrl/proton-drive-linux/issues\n"
|
||||
"POT-Creation-Date: 2026-11-21 23:13+0100\n"
|
||||
"POT-Creation-Date: 2026-11-22 00:24+0100\n"
|
||||
"PO-Revision-Date: 2026-09-23 12:00+0200\n"
|
||||
"Last-Translator: Proton Drive for Linux contributors\n"
|
||||
"Language-Team: Spanish\n"
|
||||
@@ -209,12 +209,11 @@ msgstr ""
|
||||
#: crates/pdfs-gui/src/app/main.rs:1479
|
||||
msgid ""
|
||||
"The places map is drawn from <a href=\"https://www.naturalearthdata.com/"
|
||||
"\">Natural Earth</a> land outlines and country borders, which are in the "
|
||||
"public domain."
|
||||
"\">Natural Earth</a> land, water and borders, which are in the public domain."
|
||||
msgstr ""
|
||||
"El mapa de lugares se dibuja a partir de los contornos terrestres y las "
|
||||
"fronteras de países de <a href=\"https://www.naturalearthdata.com/\">Natural "
|
||||
"Earth</a>, que son de dominio público."
|
||||
"El mapa de lugares se dibuja a partir de las tierras, las aguas y las "
|
||||
"fronteras de <a href=\"https://www.naturalearthdata.com/\">Natural Earth</"
|
||||
"a>, que son de dominio público."
|
||||
|
||||
#: crates/pdfs-gui/src/app/main.rs:1487
|
||||
msgid ""
|
||||
@@ -1566,7 +1565,7 @@ msgstr[1] "{n} fotos · compartido conmigo"
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/albums.rs:608
|
||||
#: crates/pdfs-gui/src/app/pages/places.rs:307
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:1554
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:1555
|
||||
#, rust-format
|
||||
msgid "{n} photo"
|
||||
msgid_plural "{n} photos"
|
||||
@@ -3802,7 +3801,6 @@ msgstr "Código de autenticación"
|
||||
msgid "Confirm"
|
||||
msgstr "Confirmar"
|
||||
|
||||
#
|
||||
#: crates/pdfs-gui/src/app/pages/login.rs:629
|
||||
msgid "Verify in Your Browser"
|
||||
msgstr "Verificar en el navegador"
|
||||
@@ -3816,12 +3814,10 @@ msgstr ""
|
||||
"sistema. Ábrala en su navegador, complétela allí y luego vuelva y elija "
|
||||
"“Continuar”."
|
||||
|
||||
#
|
||||
#: crates/pdfs-gui/src/app/pages/login.rs:637
|
||||
msgid "Open Verification Page"
|
||||
msgstr "Abrir página de verificación"
|
||||
|
||||
#
|
||||
#: crates/pdfs-gui/src/app/pages/login.rs:644
|
||||
msgid "Continue"
|
||||
msgstr "Continuar"
|
||||
@@ -3843,8 +3839,12 @@ msgid ""
|
||||
msgid_plural ""
|
||||
"{n} changes are not on Proton Drive yet. They stay on this computer and are "
|
||||
"sent after you sign in again."
|
||||
msgstr[0] "{n} cambio aún no está en Proton Drive. Se queda en este equipo y se envía cuando vuelva a iniciar sesión."
|
||||
msgstr[1] "{n} cambios aún no están en Proton Drive. Se quedan en este equipo y se envían cuando vuelva a iniciar sesión."
|
||||
msgstr[0] ""
|
||||
"{n} cambio aún no está en Proton Drive. Se queda en este equipo y se envía "
|
||||
"cuando vuelva a iniciar sesión."
|
||||
msgstr[1] ""
|
||||
"{n} cambios aún no están en Proton Drive. Se quedan en este equipo y se "
|
||||
"envían cuando vuelva a iniciar sesión."
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/login.rs:715
|
||||
msgid "Sign Out?"
|
||||
@@ -4603,26 +4603,35 @@ msgid_plural "{country} · {n} photos"
|
||||
msgstr[0] "{country} · {n} foto"
|
||||
msgstr[1] "{country} · {n} fotos"
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:283
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:289
|
||||
msgid "Zoom In"
|
||||
msgstr "Ampliar"
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:284
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:290
|
||||
msgid "Zoom Out"
|
||||
msgstr "Reducir"
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:285
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:291
|
||||
msgid "Show All Places"
|
||||
msgstr "Mostrar todos los lugares"
|
||||
|
||||
#. Translators: the credit on the street map. {openfreemap},
|
||||
#. {openmaptiles} and {openstreetmap} are the linked names of
|
||||
#. the projects, which stay as they are.
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:308
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:1577
|
||||
#, rust-format
|
||||
msgid "{openfreemap} © {openmaptiles} Data from {openstreetmap}"
|
||||
msgstr "{openfreemap} © {openmaptiles} Datos de {openstreetmap}"
|
||||
|
||||
#. Translators: the credit on the offline map. {naturalearth} and
|
||||
#. {geonames} are the linked names of the projects, which stay as
|
||||
#. they are.
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:1598
|
||||
#, rust-format
|
||||
msgid "Map data © {naturalearth} (public domain) and {geonames} (CC BY 4.0)"
|
||||
msgstr ""
|
||||
"Datos del mapa © {naturalearth} (dominio público) y {geonames} (CC BY 4.0)"
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/preferences_apps.rs:35
|
||||
msgid "Text"
|
||||
msgstr "Texto"
|
||||
@@ -5419,11 +5428,11 @@ msgstr "Mapa de calles en Lugares"
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/status.rs:248
|
||||
msgid ""
|
||||
"Show streets and town names from OpenFreeMap. It learns which parts of the "
|
||||
"world you look at."
|
||||
"Show streets from OpenFreeMap instead of the offline map. It learns which "
|
||||
"parts of the world you look at."
|
||||
msgstr ""
|
||||
"Mostrar calles y nombres de poblaciones de OpenFreeMap. OpenFreeMap sabrá "
|
||||
"qué partes del mundo se consultan."
|
||||
"Mostrar calles de OpenFreeMap en lugar del mapa sin conexión. OpenFreeMap "
|
||||
"sabrá qué partes del mundo se consultan."
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/status.rs:253
|
||||
msgid "Show tray icon"
|
||||
@@ -7491,8 +7500,6 @@ msgstr "no se puede contactar con el demonio de Proton Drive: {error}"
|
||||
#~ msgstr "Actualizar galerías"
|
||||
|
||||
#, fuzzy
|
||||
#~| msgctxt "verb"
|
||||
#~| msgid "Resume"
|
||||
#~ msgid "Resume"
|
||||
#~ msgstr "Reanudar"
|
||||
|
||||
@@ -7813,7 +7820,5 @@ msgstr "no se puede contactar con el demonio de Proton Drive: {error}"
|
||||
#~ msgstr "No se pudo guardar el color de acento"
|
||||
|
||||
#, fuzzy
|
||||
#~| msgctxt "layout"
|
||||
#~| msgid "Grid"
|
||||
#~ msgid "Grid"
|
||||
#~ msgstr "Cuadrícula"
|
||||
@@ -5,7 +5,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: proton-drive-linux 2.1.0\n"
|
||||
"Report-Msgid-Bugs-To: https://github.com/narrrl/proton-drive-linux/issues\n"
|
||||
"POT-Creation-Date: 2026-11-21 23:13+0100\n"
|
||||
"POT-Creation-Date: 2026-11-22 00:24+0100\n"
|
||||
"PO-Revision-Date: 2026-09-23 12:00+0200\n"
|
||||
"Last-Translator: Proton Drive for Linux contributors\n"
|
||||
"Language-Team: French\n"
|
||||
@@ -210,12 +210,11 @@ msgstr ""
|
||||
#: crates/pdfs-gui/src/app/main.rs:1479
|
||||
msgid ""
|
||||
"The places map is drawn from <a href=\"https://www.naturalearthdata.com/"
|
||||
"\">Natural Earth</a> land outlines and country borders, which are in the "
|
||||
"public domain."
|
||||
"\">Natural Earth</a> land, water and borders, which are in the public domain."
|
||||
msgstr ""
|
||||
"La carte des lieux est dessinée à partir des contours des terres et des "
|
||||
"frontières des pays de <a href=\"https://www.naturalearthdata.com/\">Natural "
|
||||
"Earth</a>, qui sont dans le domaine public."
|
||||
"La carte des lieux est dessinée à partir des terres, des eaux et des "
|
||||
"frontières de <a href=\"https://www.naturalearthdata.com/\">Natural Earth</"
|
||||
"a>, qui sont dans le domaine public."
|
||||
|
||||
#: crates/pdfs-gui/src/app/main.rs:1487
|
||||
msgid ""
|
||||
@@ -1577,7 +1576,7 @@ msgstr[1] "{n} photos · partagé avec moi"
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/albums.rs:608
|
||||
#: crates/pdfs-gui/src/app/pages/places.rs:307
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:1554
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:1555
|
||||
#, rust-format
|
||||
msgid "{n} photo"
|
||||
msgid_plural "{n} photos"
|
||||
@@ -3830,7 +3829,6 @@ msgstr "Code d’authentification"
|
||||
msgid "Confirm"
|
||||
msgstr "Confirmer"
|
||||
|
||||
#
|
||||
#: crates/pdfs-gui/src/app/pages/login.rs:629
|
||||
msgid "Verify in Your Browser"
|
||||
msgstr "Vérifier dans le navigateur"
|
||||
@@ -3844,12 +3842,10 @@ msgstr ""
|
||||
"système. Ouvrez-la dans votre navigateur, terminez-la, puis revenez et "
|
||||
"choisissez « Continuer »."
|
||||
|
||||
#
|
||||
#: crates/pdfs-gui/src/app/pages/login.rs:637
|
||||
msgid "Open Verification Page"
|
||||
msgstr "Ouvrir la page de vérification"
|
||||
|
||||
#
|
||||
#: crates/pdfs-gui/src/app/pages/login.rs:644
|
||||
msgid "Continue"
|
||||
msgstr "Continuer"
|
||||
@@ -3871,8 +3867,12 @@ msgid ""
|
||||
msgid_plural ""
|
||||
"{n} changes are not on Proton Drive yet. They stay on this computer and are "
|
||||
"sent after you sign in again."
|
||||
msgstr[0] "{n} modification n’est pas encore sur Proton Drive. Elle reste sur cet ordinateur et sera envoyée lorsque vous vous reconnecterez."
|
||||
msgstr[1] "{n} modifications ne sont pas encore sur Proton Drive. Elles restent sur cet ordinateur et seront envoyées lorsque vous vous reconnecterez."
|
||||
msgstr[0] ""
|
||||
"{n} modification n’est pas encore sur Proton Drive. Elle reste sur cet "
|
||||
"ordinateur et sera envoyée lorsque vous vous reconnecterez."
|
||||
msgstr[1] ""
|
||||
"{n} modifications ne sont pas encore sur Proton Drive. Elles restent sur cet "
|
||||
"ordinateur et seront envoyées lorsque vous vous reconnecterez."
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/login.rs:715
|
||||
msgid "Sign Out?"
|
||||
@@ -4636,26 +4636,36 @@ msgid_plural "{country} · {n} photos"
|
||||
msgstr[0] "{country} · {n} photo"
|
||||
msgstr[1] "{country} · {n} photos"
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:283
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:289
|
||||
msgid "Zoom In"
|
||||
msgstr "Zoom avant"
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:284
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:290
|
||||
msgid "Zoom Out"
|
||||
msgstr "Zoom arrière"
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:285
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:291
|
||||
msgid "Show All Places"
|
||||
msgstr "Afficher tous les lieux"
|
||||
|
||||
#. Translators: the credit on the street map. {openfreemap},
|
||||
#. {openmaptiles} and {openstreetmap} are the linked names of
|
||||
#. the projects, which stay as they are.
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:308
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:1577
|
||||
#, rust-format
|
||||
msgid "{openfreemap} © {openmaptiles} Data from {openstreetmap}"
|
||||
msgstr "{openfreemap} © {openmaptiles} Données d’{openstreetmap}"
|
||||
|
||||
#. Translators: the credit on the offline map. {naturalearth} and
|
||||
#. {geonames} are the linked names of the projects, which stay as
|
||||
#. they are.
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:1598
|
||||
#, rust-format
|
||||
msgid "Map data © {naturalearth} (public domain) and {geonames} (CC BY 4.0)"
|
||||
msgstr ""
|
||||
"Données cartographiques © {naturalearth} (domaine public) et {geonames} (CC "
|
||||
"BY 4.0)"
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/preferences_apps.rs:35
|
||||
msgid "Text"
|
||||
msgstr "Texte"
|
||||
@@ -5461,10 +5471,10 @@ msgstr "Carte des rues dans Lieux"
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/status.rs:248
|
||||
msgid ""
|
||||
"Show streets and town names from OpenFreeMap. It learns which parts of the "
|
||||
"world you look at."
|
||||
"Show streets from OpenFreeMap instead of the offline map. It learns which "
|
||||
"parts of the world you look at."
|
||||
msgstr ""
|
||||
"Afficher les rues et les noms de localités d’OpenFreeMap. OpenFreeMap "
|
||||
"Afficher les rues d’OpenFreeMap au lieu de la carte hors ligne. OpenFreeMap "
|
||||
"apprend ainsi quelles parties du monde sont consultées."
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/status.rs:253
|
||||
@@ -7544,8 +7554,6 @@ msgstr "impossible de joindre le démon Proton Drive : {error}"
|
||||
#~ msgstr "Actualiser les galeries"
|
||||
|
||||
#, fuzzy
|
||||
#~| msgctxt "verb"
|
||||
#~| msgid "Resume"
|
||||
#~ msgid "Resume"
|
||||
#~ msgstr "Reprendre"
|
||||
|
||||
@@ -7867,7 +7875,5 @@ msgstr "impossible de joindre le démon Proton Drive : {error}"
|
||||
#~ msgstr "Impossible d’enregistrer la couleur d’accentuation"
|
||||
|
||||
#, fuzzy
|
||||
#~| msgctxt "layout"
|
||||
#~| msgid "Grid"
|
||||
#~ msgid "Grid"
|
||||
#~ msgstr "Grille"
|
||||
@@ -5,7 +5,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: proton-drive-linux 2.1.0\n"
|
||||
"Report-Msgid-Bugs-To: https://github.com/narrrl/proton-drive-linux/issues\n"
|
||||
"POT-Creation-Date: 2026-11-21 23:13+0100\n"
|
||||
"POT-Creation-Date: 2026-11-22 00:24+0100\n"
|
||||
"PO-Revision-Date: 2026-09-23 12:00+0200\n"
|
||||
"Last-Translator: Proton Drive for Linux contributors\n"
|
||||
"Language-Team: Italian\n"
|
||||
@@ -208,12 +208,11 @@ msgstr ""
|
||||
#: crates/pdfs-gui/src/app/main.rs:1479
|
||||
msgid ""
|
||||
"The places map is drawn from <a href=\"https://www.naturalearthdata.com/"
|
||||
"\">Natural Earth</a> land outlines and country borders, which are in the "
|
||||
"public domain."
|
||||
"\">Natural Earth</a> land, water and borders, which are in the public domain."
|
||||
msgstr ""
|
||||
"La mappa dei luoghi è disegnata dai contorni delle terre emerse e dai "
|
||||
"confini nazionali di <a href=\"https://www.naturalearthdata.com/\">Natural "
|
||||
"Earth</a>, che sono di pubblico dominio."
|
||||
"La mappa dei luoghi è disegnata da terre emerse, acque e confini di <a "
|
||||
"href=\"https://www.naturalearthdata.com/\">Natural Earth</a>, che sono di "
|
||||
"pubblico dominio."
|
||||
|
||||
#: crates/pdfs-gui/src/app/main.rs:1487
|
||||
msgid ""
|
||||
@@ -1571,7 +1570,7 @@ msgstr[1] "{n} foto · condiviso con me"
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/albums.rs:608
|
||||
#: crates/pdfs-gui/src/app/pages/places.rs:307
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:1554
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:1555
|
||||
#, rust-format
|
||||
msgid "{n} photo"
|
||||
msgid_plural "{n} photos"
|
||||
@@ -3821,7 +3820,6 @@ msgstr "Codice di autenticazione"
|
||||
msgid "Confirm"
|
||||
msgstr "Conferma"
|
||||
|
||||
#
|
||||
#: crates/pdfs-gui/src/app/pages/login.rs:629
|
||||
msgid "Verify in Your Browser"
|
||||
msgstr "Verifica nel browser"
|
||||
@@ -3834,12 +3832,10 @@ msgstr ""
|
||||
"La pagina di verifica non può essere mostrata nell’app su questo sistema. "
|
||||
"Aprila nel browser, completala lì, poi torna qui e scegli “Continua”."
|
||||
|
||||
#
|
||||
#: crates/pdfs-gui/src/app/pages/login.rs:637
|
||||
msgid "Open Verification Page"
|
||||
msgstr "Apri pagina di verifica"
|
||||
|
||||
#
|
||||
#: crates/pdfs-gui/src/app/pages/login.rs:644
|
||||
msgid "Continue"
|
||||
msgstr "Continua"
|
||||
@@ -3860,8 +3856,12 @@ msgid ""
|
||||
msgid_plural ""
|
||||
"{n} changes are not on Proton Drive yet. They stay on this computer and are "
|
||||
"sent after you sign in again."
|
||||
msgstr[0] "{n} modifica non è ancora su Proton Drive. Resta su questo computer e viene inviata quando accedi di nuovo."
|
||||
msgstr[1] "{n} modifiche non sono ancora su Proton Drive. Restano su questo computer e vengono inviate quando accedi di nuovo."
|
||||
msgstr[0] ""
|
||||
"{n} modifica non è ancora su Proton Drive. Resta su questo computer e viene "
|
||||
"inviata quando accedi di nuovo."
|
||||
msgstr[1] ""
|
||||
"{n} modifiche non sono ancora su Proton Drive. Restano su questo computer e "
|
||||
"vengono inviate quando accedi di nuovo."
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/login.rs:715
|
||||
msgid "Sign Out?"
|
||||
@@ -4618,26 +4618,35 @@ msgid_plural "{country} · {n} photos"
|
||||
msgstr[0] "{country} · {n} foto"
|
||||
msgstr[1] "{country} · {n} foto"
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:283
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:289
|
||||
msgid "Zoom In"
|
||||
msgstr "Ingrandisci"
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:284
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:290
|
||||
msgid "Zoom Out"
|
||||
msgstr "Riduci"
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:285
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:291
|
||||
msgid "Show All Places"
|
||||
msgstr "Mostra tutti i luoghi"
|
||||
|
||||
#. Translators: the credit on the street map. {openfreemap},
|
||||
#. {openmaptiles} and {openstreetmap} are the linked names of
|
||||
#. the projects, which stay as they are.
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:308
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:1577
|
||||
#, rust-format
|
||||
msgid "{openfreemap} © {openmaptiles} Data from {openstreetmap}"
|
||||
msgstr "{openfreemap} © {openmaptiles} Dati da {openstreetmap}"
|
||||
|
||||
#. Translators: the credit on the offline map. {naturalearth} and
|
||||
#. {geonames} are the linked names of the projects, which stay as
|
||||
#. they are.
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:1598
|
||||
#, rust-format
|
||||
msgid "Map data © {naturalearth} (public domain) and {geonames} (CC BY 4.0)"
|
||||
msgstr ""
|
||||
"Dati della mappa © {naturalearth} (pubblico dominio) e {geonames} (CC BY 4.0)"
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/preferences_apps.rs:35
|
||||
msgid "Text"
|
||||
msgstr "Testo"
|
||||
@@ -5438,11 +5447,11 @@ msgstr "Mappa stradale in Luoghi"
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/status.rs:248
|
||||
msgid ""
|
||||
"Show streets and town names from OpenFreeMap. It learns which parts of the "
|
||||
"world you look at."
|
||||
"Show streets from OpenFreeMap instead of the offline map. It learns which "
|
||||
"parts of the world you look at."
|
||||
msgstr ""
|
||||
"Mostra strade e nomi delle località da OpenFreeMap. OpenFreeMap viene così a "
|
||||
"sapere quali parti del mondo vengono guardate."
|
||||
"Mostra le strade da OpenFreeMap invece della mappa offline. OpenFreeMap "
|
||||
"viene così a sapere quali parti del mondo vengono guardate."
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/status.rs:253
|
||||
msgid "Show tray icon"
|
||||
@@ -7514,8 +7523,6 @@ msgstr "impossibile raggiungere il demone di Proton Drive: {error}"
|
||||
#~ msgstr "Aggiorna gallerie"
|
||||
|
||||
#, fuzzy
|
||||
#~| msgctxt "verb"
|
||||
#~| msgid "Resume"
|
||||
#~ msgid "Resume"
|
||||
#~ msgstr "Riprendi"
|
||||
|
||||
@@ -7833,7 +7840,5 @@ msgstr "impossibile raggiungere il demone di Proton Drive: {error}"
|
||||
#~ msgstr "Impossibile salvare il colore di risalto"
|
||||
|
||||
#, fuzzy
|
||||
#~| msgctxt "layout"
|
||||
#~| msgid "Grid"
|
||||
#~ msgid "Grid"
|
||||
#~ msgstr "Griglia"
|
||||
@@ -5,7 +5,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: proton-drive-linux 2.1.0\n"
|
||||
"Report-Msgid-Bugs-To: https://github.com/narrrl/proton-drive-linux/issues\n"
|
||||
"POT-Creation-Date: 2026-11-21 23:13+0100\n"
|
||||
"POT-Creation-Date: 2026-11-22 00:24+0100\n"
|
||||
"PO-Revision-Date: 2026-09-23 12:00+0200\n"
|
||||
"Last-Translator: Proton Drive for Linux contributors\n"
|
||||
"Language-Team: Dutch\n"
|
||||
@@ -209,10 +209,9 @@ msgstr ""
|
||||
#: crates/pdfs-gui/src/app/main.rs:1479
|
||||
msgid ""
|
||||
"The places map is drawn from <a href=\"https://www.naturalearthdata.com/"
|
||||
"\">Natural Earth</a> land outlines and country borders, which are in the "
|
||||
"public domain."
|
||||
"\">Natural Earth</a> land, water and borders, which are in the public domain."
|
||||
msgstr ""
|
||||
"De plaatsenkaart is getekend met de landcontouren en landsgrenzen van <a "
|
||||
"De plaatsenkaart is getekend met land, water en grenzen van <a "
|
||||
"href=\"https://www.naturalearthdata.com/\">Natural Earth</a>, die in het "
|
||||
"publieke domein vallen."
|
||||
|
||||
@@ -1567,7 +1566,7 @@ msgstr[1] "{n} foto's · gedeeld met mij"
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/albums.rs:608
|
||||
#: crates/pdfs-gui/src/app/pages/places.rs:307
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:1554
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:1555
|
||||
#, rust-format
|
||||
msgid "{n} photo"
|
||||
msgid_plural "{n} photos"
|
||||
@@ -3809,7 +3808,6 @@ msgstr "Verificatiecode"
|
||||
msgid "Confirm"
|
||||
msgstr "Bevestigen"
|
||||
|
||||
#
|
||||
#: crates/pdfs-gui/src/app/pages/login.rs:629
|
||||
msgid "Verify in Your Browser"
|
||||
msgstr "Verifiëren in je browser"
|
||||
@@ -3822,12 +3820,10 @@ msgstr ""
|
||||
"De verificatiepagina kan op dit systeem niet in de app worden getoond. Open "
|
||||
"hem in je browser, voltooi hem daar, kom dan terug en kies “Doorgaan”."
|
||||
|
||||
#
|
||||
#: crates/pdfs-gui/src/app/pages/login.rs:637
|
||||
msgid "Open Verification Page"
|
||||
msgstr "Verificatiepagina openen"
|
||||
|
||||
#
|
||||
#: crates/pdfs-gui/src/app/pages/login.rs:644
|
||||
msgid "Continue"
|
||||
msgstr "Doorgaan"
|
||||
@@ -3849,8 +3845,12 @@ msgid ""
|
||||
msgid_plural ""
|
||||
"{n} changes are not on Proton Drive yet. They stay on this computer and are "
|
||||
"sent after you sign in again."
|
||||
msgstr[0] "{n} wijziging staat nog niet op Proton Drive. Ze blijft op deze computer en wordt verstuurd zodra je weer inlogt."
|
||||
msgstr[1] "{n} wijzigingen staan nog niet op Proton Drive. Ze blijven op deze computer en worden verstuurd zodra je weer inlogt."
|
||||
msgstr[0] ""
|
||||
"{n} wijziging staat nog niet op Proton Drive. Ze blijft op deze computer en "
|
||||
"wordt verstuurd zodra je weer inlogt."
|
||||
msgstr[1] ""
|
||||
"{n} wijzigingen staan nog niet op Proton Drive. Ze blijven op deze computer "
|
||||
"en worden verstuurd zodra je weer inlogt."
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/login.rs:715
|
||||
msgid "Sign Out?"
|
||||
@@ -4613,26 +4613,35 @@ msgid_plural "{country} · {n} photos"
|
||||
msgstr[0] "{country} · {n} foto"
|
||||
msgstr[1] "{country} · {n} foto’s"
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:283
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:289
|
||||
msgid "Zoom In"
|
||||
msgstr "Inzoomen"
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:284
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:290
|
||||
msgid "Zoom Out"
|
||||
msgstr "Uitzoomen"
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:285
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:291
|
||||
msgid "Show All Places"
|
||||
msgstr "Alle plaatsen tonen"
|
||||
|
||||
#. Translators: the credit on the street map. {openfreemap},
|
||||
#. {openmaptiles} and {openstreetmap} are the linked names of
|
||||
#. the projects, which stay as they are.
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:308
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:1577
|
||||
#, rust-format
|
||||
msgid "{openfreemap} © {openmaptiles} Data from {openstreetmap}"
|
||||
msgstr "{openfreemap} © {openmaptiles} Gegevens van {openstreetmap}"
|
||||
|
||||
#. Translators: the credit on the offline map. {naturalearth} and
|
||||
#. {geonames} are the linked names of the projects, which stay as
|
||||
#. they are.
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:1598
|
||||
#, rust-format
|
||||
msgid "Map data © {naturalearth} (public domain) and {geonames} (CC BY 4.0)"
|
||||
msgstr ""
|
||||
"Kaartgegevens © {naturalearth} (publiek domein) en {geonames} (CC BY 4.0)"
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/preferences_apps.rs:35
|
||||
msgid "Text"
|
||||
msgstr "Tekst"
|
||||
@@ -5434,11 +5443,11 @@ msgstr "Stratenkaart voor Plaatsen"
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/status.rs:248
|
||||
msgid ""
|
||||
"Show streets and town names from OpenFreeMap. It learns which parts of the "
|
||||
"world you look at."
|
||||
"Show streets from OpenFreeMap instead of the offline map. It learns which "
|
||||
"parts of the world you look at."
|
||||
msgstr ""
|
||||
"Straten en plaatsnamen van OpenFreeMap tonen. OpenFreeMap ziet daarbij welke "
|
||||
"delen van de wereld worden bekeken."
|
||||
"Straten van OpenFreeMap tonen in plaats van de offline kaart. OpenFreeMap "
|
||||
"ziet daarbij welke delen van de wereld worden bekeken."
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/status.rs:253
|
||||
msgid "Show tray icon"
|
||||
@@ -7505,8 +7514,6 @@ msgstr "kan de achtergronddienst van Proton Drive niet bereiken: {error}"
|
||||
#~ msgstr "Galerijen vernieuwen"
|
||||
|
||||
#, fuzzy
|
||||
#~| msgctxt "verb"
|
||||
#~| msgid "Resume"
|
||||
#~ msgid "Resume"
|
||||
#~ msgstr "Hervatten"
|
||||
|
||||
@@ -7825,7 +7832,5 @@ msgstr "kan de achtergronddienst van Proton Drive niet bereiken: {error}"
|
||||
#~ msgstr "Kon de accentkleur niet opslaan"
|
||||
|
||||
#, fuzzy
|
||||
#~| msgctxt "layout"
|
||||
#~| msgid "Grid"
|
||||
#~ msgid "Grid"
|
||||
#~ msgstr "Raster"
|
||||
+17
-10
@@ -8,7 +8,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: proton-drive-linux 3.9.0\n"
|
||||
"Report-Msgid-Bugs-To: https://github.com/narrrl/proton-drive-linux/issues\n"
|
||||
"POT-Creation-Date: 2026-11-21 23:13+0100\n"
|
||||
"POT-Creation-Date: 2026-11-22 00:24+0100\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
@@ -195,8 +195,7 @@ msgstr ""
|
||||
#: crates/pdfs-gui/src/app/main.rs:1479
|
||||
msgid ""
|
||||
"The places map is drawn from <a href=\"https://www.naturalearthdata.com/"
|
||||
"\">Natural Earth</a> land outlines and country borders, which are in the "
|
||||
"public domain."
|
||||
"\">Natural Earth</a> land, water and borders, which are in the public domain."
|
||||
msgstr ""
|
||||
|
||||
#: crates/pdfs-gui/src/app/main.rs:1487
|
||||
@@ -1514,7 +1513,7 @@ msgstr[1] ""
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/albums.rs:608
|
||||
#: crates/pdfs-gui/src/app/pages/places.rs:307
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:1554
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:1555
|
||||
#, rust-format
|
||||
msgid "{n} photo"
|
||||
msgid_plural "{n} photos"
|
||||
@@ -4407,26 +4406,34 @@ msgid_plural "{country} · {n} photos"
|
||||
msgstr[0] ""
|
||||
msgstr[1] ""
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:283
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:289
|
||||
msgid "Zoom In"
|
||||
msgstr ""
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:284
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:290
|
||||
msgid "Zoom Out"
|
||||
msgstr ""
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:285
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:291
|
||||
msgid "Show All Places"
|
||||
msgstr ""
|
||||
|
||||
#. Translators: the credit on the street map. {openfreemap},
|
||||
#. {openmaptiles} and {openstreetmap} are the linked names of
|
||||
#. the projects, which stay as they are.
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:308
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:1577
|
||||
#, rust-format
|
||||
msgid "{openfreemap} © {openmaptiles} Data from {openstreetmap}"
|
||||
msgstr ""
|
||||
|
||||
#. Translators: the credit on the offline map. {naturalearth} and
|
||||
#. {geonames} are the linked names of the projects, which stay as
|
||||
#. they are.
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:1598
|
||||
#, rust-format
|
||||
msgid "Map data © {naturalearth} (public domain) and {geonames} (CC BY 4.0)"
|
||||
msgstr ""
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/preferences_apps.rs:35
|
||||
msgid "Text"
|
||||
msgstr ""
|
||||
@@ -5188,8 +5195,8 @@ msgstr ""
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/status.rs:248
|
||||
msgid ""
|
||||
"Show streets and town names from OpenFreeMap. It learns which parts of the "
|
||||
"world you look at."
|
||||
"Show streets from OpenFreeMap instead of the offline map. It learns which "
|
||||
"parts of the world you look at."
|
||||
msgstr ""
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/status.rs:253
|
||||
|
||||
@@ -5,7 +5,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: proton-drive-linux 2.1.0\n"
|
||||
"Report-Msgid-Bugs-To: https://github.com/narrrl/proton-drive-linux/issues\n"
|
||||
"POT-Creation-Date: 2026-11-21 23:13+0100\n"
|
||||
"POT-Creation-Date: 2026-11-22 00:24+0100\n"
|
||||
"PO-Revision-Date: 2026-09-23 12:00+0200\n"
|
||||
"Last-Translator: Proton Drive for Linux contributors\n"
|
||||
"Language-Team: Polish\n"
|
||||
@@ -212,10 +212,9 @@ msgstr ""
|
||||
#: crates/pdfs-gui/src/app/main.rs:1479
|
||||
msgid ""
|
||||
"The places map is drawn from <a href=\"https://www.naturalearthdata.com/"
|
||||
"\">Natural Earth</a> land outlines and country borders, which are in the "
|
||||
"public domain."
|
||||
"\">Natural Earth</a> land, water and borders, which are in the public domain."
|
||||
msgstr ""
|
||||
"Mapa miejsc jest rysowana z konturów lądów i granic państw <a href=\"https://"
|
||||
"Mapa miejsc jest rysowana z lądów, wód i granic <a href=\"https://"
|
||||
"www.naturalearthdata.com/\">Natural Earth</a>, które należą do domeny "
|
||||
"publicznej."
|
||||
|
||||
@@ -1606,7 +1605,7 @@ msgstr[2] "{n} zdjęć · udostępnione mi"
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/albums.rs:608
|
||||
#: crates/pdfs-gui/src/app/pages/places.rs:307
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:1554
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:1555
|
||||
#, rust-format
|
||||
msgid "{n} photo"
|
||||
msgid_plural "{n} photos"
|
||||
@@ -3879,7 +3878,6 @@ msgstr "Kod uwierzytelniania"
|
||||
msgid "Confirm"
|
||||
msgstr "Potwierdź"
|
||||
|
||||
#
|
||||
#: crates/pdfs-gui/src/app/pages/login.rs:629
|
||||
msgid "Verify in Your Browser"
|
||||
msgstr "Weryfikacja w przeglądarce"
|
||||
@@ -3893,12 +3891,10 @@ msgstr ""
|
||||
"otworzyć ją w przeglądarce, ukończyć tam weryfikację, a następnie wrócić i "
|
||||
"wybrać „Kontynuuj”."
|
||||
|
||||
#
|
||||
#: crates/pdfs-gui/src/app/pages/login.rs:637
|
||||
msgid "Open Verification Page"
|
||||
msgstr "Otwórz stronę weryfikacji"
|
||||
|
||||
#
|
||||
#: crates/pdfs-gui/src/app/pages/login.rs:644
|
||||
msgid "Continue"
|
||||
msgstr "Kontynuuj"
|
||||
@@ -3919,9 +3915,15 @@ msgid ""
|
||||
msgid_plural ""
|
||||
"{n} changes are not on Proton Drive yet. They stay on this computer and are "
|
||||
"sent after you sign in again."
|
||||
msgstr[0] "{n} zmiana nie jest jeszcze w Proton Drive. Zostaje na tym komputerze i zostanie wysłana po ponownym zalogowaniu."
|
||||
msgstr[1] "{n} zmiany nie są jeszcze w Proton Drive. Zostają na tym komputerze i zostaną wysłane po ponownym zalogowaniu."
|
||||
msgstr[2] "{n} zmian nie jest jeszcze w Proton Drive. Zostają na tym komputerze i zostaną wysłane po ponownym zalogowaniu."
|
||||
msgstr[0] ""
|
||||
"{n} zmiana nie jest jeszcze w Proton Drive. Zostaje na tym komputerze i "
|
||||
"zostanie wysłana po ponownym zalogowaniu."
|
||||
msgstr[1] ""
|
||||
"{n} zmiany nie są jeszcze w Proton Drive. Zostają na tym komputerze i "
|
||||
"zostaną wysłane po ponownym zalogowaniu."
|
||||
msgstr[2] ""
|
||||
"{n} zmian nie jest jeszcze w Proton Drive. Zostają na tym komputerze i "
|
||||
"zostaną wysłane po ponownym zalogowaniu."
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/login.rs:715
|
||||
msgid "Sign Out?"
|
||||
@@ -4694,26 +4696,34 @@ msgstr[0] "{country} · {n} zdjęcie"
|
||||
msgstr[1] "{country} · {n} zdjęcia"
|
||||
msgstr[2] "{country} · {n} zdjęć"
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:283
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:289
|
||||
msgid "Zoom In"
|
||||
msgstr "Powiększ"
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:284
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:290
|
||||
msgid "Zoom Out"
|
||||
msgstr "Pomniejsz"
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:285
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:291
|
||||
msgid "Show All Places"
|
||||
msgstr "Pokaż wszystkie miejsca"
|
||||
|
||||
#. Translators: the credit on the street map. {openfreemap},
|
||||
#. {openmaptiles} and {openstreetmap} are the linked names of
|
||||
#. the projects, which stay as they are.
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:308
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:1577
|
||||
#, rust-format
|
||||
msgid "{openfreemap} © {openmaptiles} Data from {openstreetmap}"
|
||||
msgstr "{openfreemap} © {openmaptiles} Dane z {openstreetmap}"
|
||||
|
||||
#. Translators: the credit on the offline map. {naturalearth} and
|
||||
#. {geonames} are the linked names of the projects, which stay as
|
||||
#. they are.
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:1598
|
||||
#, rust-format
|
||||
msgid "Map data © {naturalearth} (public domain) and {geonames} (CC BY 4.0)"
|
||||
msgstr "Dane mapy © {naturalearth} (domena publiczna) i {geonames} (CC BY 4.0)"
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/preferences_apps.rs:35
|
||||
msgid "Text"
|
||||
msgstr "Tekst"
|
||||
@@ -5521,10 +5531,10 @@ msgstr "Mapa ulic w widoku Miejsca"
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/status.rs:248
|
||||
msgid ""
|
||||
"Show streets and town names from OpenFreeMap. It learns which parts of the "
|
||||
"world you look at."
|
||||
"Show streets from OpenFreeMap instead of the offline map. It learns which "
|
||||
"parts of the world you look at."
|
||||
msgstr ""
|
||||
"Wyświetlanie ulic i nazw miejscowości z OpenFreeMap. OpenFreeMap dowiaduje "
|
||||
"Wyświetlanie ulic z OpenFreeMap zamiast mapy offline. OpenFreeMap dowiaduje "
|
||||
"się przy tym, które części świata są oglądane."
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/status.rs:253
|
||||
@@ -7626,8 +7636,6 @@ msgstr "nie można połączyć się z usługą Proton Drive: {error}"
|
||||
#~ msgstr "Odśwież galerie"
|
||||
|
||||
#, fuzzy
|
||||
#~| msgctxt "verb"
|
||||
#~| msgid "Resume"
|
||||
#~ msgid "Resume"
|
||||
#~ msgstr "Wznów"
|
||||
|
||||
@@ -7947,7 +7955,5 @@ msgstr "nie można połączyć się z usługą Proton Drive: {error}"
|
||||
#~ msgstr "Nie można zapisać koloru akcentu"
|
||||
|
||||
#, fuzzy
|
||||
#~| msgctxt "layout"
|
||||
#~| msgid "Grid"
|
||||
#~ msgid "Grid"
|
||||
#~ msgstr "Siatka"
|
||||
+29
-24
@@ -5,7 +5,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: proton-drive-linux 2.1.0\n"
|
||||
"Report-Msgid-Bugs-To: https://github.com/narrrl/proton-drive-linux/issues\n"
|
||||
"POT-Creation-Date: 2026-11-21 23:13+0100\n"
|
||||
"POT-Creation-Date: 2026-11-22 00:24+0100\n"
|
||||
"PO-Revision-Date: 2026-09-23 12:00+0200\n"
|
||||
"Last-Translator: Proton Drive for Linux contributors\n"
|
||||
"Language-Team: Portuguese (Brazil)\n"
|
||||
@@ -208,12 +208,11 @@ msgstr ""
|
||||
#: crates/pdfs-gui/src/app/main.rs:1479
|
||||
msgid ""
|
||||
"The places map is drawn from <a href=\"https://www.naturalearthdata.com/"
|
||||
"\">Natural Earth</a> land outlines and country borders, which are in the "
|
||||
"public domain."
|
||||
"\">Natural Earth</a> land, water and borders, which are in the public domain."
|
||||
msgstr ""
|
||||
"O mapa de lugares é desenhado a partir dos contornos terrestres e das "
|
||||
"fronteiras de países do <a href=\"https://www.naturalearthdata.com/"
|
||||
"\">Natural Earth</a>, que são de domínio público."
|
||||
"O mapa de lugares é desenhado a partir das terras, águas e fronteiras do <a "
|
||||
"href=\"https://www.naturalearthdata.com/\">Natural Earth</a>, que são de "
|
||||
"domínio público."
|
||||
|
||||
#: crates/pdfs-gui/src/app/main.rs:1487
|
||||
msgid ""
|
||||
@@ -1568,7 +1567,7 @@ msgstr[1] "{n} fotos · compartilhado comigo"
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/albums.rs:608
|
||||
#: crates/pdfs-gui/src/app/pages/places.rs:307
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:1554
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:1555
|
||||
#, rust-format
|
||||
msgid "{n} photo"
|
||||
msgid_plural "{n} photos"
|
||||
@@ -3801,7 +3800,6 @@ msgstr "Código de autenticação"
|
||||
msgid "Confirm"
|
||||
msgstr "Confirmar"
|
||||
|
||||
#
|
||||
#: crates/pdfs-gui/src/app/pages/login.rs:629
|
||||
msgid "Verify in Your Browser"
|
||||
msgstr "Verificar no navegador"
|
||||
@@ -3814,12 +3812,10 @@ msgstr ""
|
||||
"A página de verificação não pode ser exibida no app neste sistema. Abra-a no "
|
||||
"navegador, conclua-a lá e depois volte e escolha “Continuar”."
|
||||
|
||||
#
|
||||
#: crates/pdfs-gui/src/app/pages/login.rs:637
|
||||
msgid "Open Verification Page"
|
||||
msgstr "Abrir página de verificação"
|
||||
|
||||
#
|
||||
#: crates/pdfs-gui/src/app/pages/login.rs:644
|
||||
msgid "Continue"
|
||||
msgstr "Continuar"
|
||||
@@ -3840,8 +3836,12 @@ msgid ""
|
||||
msgid_plural ""
|
||||
"{n} changes are not on Proton Drive yet. They stay on this computer and are "
|
||||
"sent after you sign in again."
|
||||
msgstr[0] "{n} alteração ainda não está no Proton Drive. Ela fica neste computador e será enviada quando você entrar novamente."
|
||||
msgstr[1] "{n} alterações ainda não estão no Proton Drive. Elas ficam neste computador e serão enviadas quando você entrar novamente."
|
||||
msgstr[0] ""
|
||||
"{n} alteração ainda não está no Proton Drive. Ela fica neste computador e "
|
||||
"será enviada quando você entrar novamente."
|
||||
msgstr[1] ""
|
||||
"{n} alterações ainda não estão no Proton Drive. Elas ficam neste computador "
|
||||
"e serão enviadas quando você entrar novamente."
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/login.rs:715
|
||||
msgid "Sign Out?"
|
||||
@@ -4601,26 +4601,35 @@ msgid_plural "{country} · {n} photos"
|
||||
msgstr[0] "{country} · {n} foto"
|
||||
msgstr[1] "{country} · {n} fotos"
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:283
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:289
|
||||
msgid "Zoom In"
|
||||
msgstr "Ampliar"
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:284
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:290
|
||||
msgid "Zoom Out"
|
||||
msgstr "Reduzir"
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:285
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:291
|
||||
msgid "Show All Places"
|
||||
msgstr "Mostrar todos os lugares"
|
||||
|
||||
#. Translators: the credit on the street map. {openfreemap},
|
||||
#. {openmaptiles} and {openstreetmap} are the linked names of
|
||||
#. the projects, which stay as they are.
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:308
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:1577
|
||||
#, rust-format
|
||||
msgid "{openfreemap} © {openmaptiles} Data from {openstreetmap}"
|
||||
msgstr "{openfreemap} © {openmaptiles} Dados do {openstreetmap}"
|
||||
|
||||
#. Translators: the credit on the offline map. {naturalearth} and
|
||||
#. {geonames} are the linked names of the projects, which stay as
|
||||
#. they are.
|
||||
#: crates/pdfs-gui/src/app/pages/places_map.rs:1598
|
||||
#, rust-format
|
||||
msgid "Map data © {naturalearth} (public domain) and {geonames} (CC BY 4.0)"
|
||||
msgstr ""
|
||||
"Dados do mapa © {naturalearth} (domínio público) e {geonames} (CC BY 4.0)"
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/preferences_apps.rs:35
|
||||
msgid "Text"
|
||||
msgstr "Texto"
|
||||
@@ -5415,11 +5424,11 @@ msgstr "Mapa de ruas em Lugares"
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/status.rs:248
|
||||
msgid ""
|
||||
"Show streets and town names from OpenFreeMap. It learns which parts of the "
|
||||
"world you look at."
|
||||
"Show streets from OpenFreeMap instead of the offline map. It learns which "
|
||||
"parts of the world you look at."
|
||||
msgstr ""
|
||||
"Mostrar ruas e nomes de cidades do OpenFreeMap. O OpenFreeMap fica sabendo "
|
||||
"quais partes do mundo são vistas."
|
||||
"Mostrar ruas do OpenFreeMap em vez do mapa offline. O OpenFreeMap fica "
|
||||
"sabendo quais partes do mundo são vistas."
|
||||
|
||||
#: crates/pdfs-gui/src/app/pages/status.rs:253
|
||||
msgid "Show tray icon"
|
||||
@@ -7484,8 +7493,6 @@ msgstr "não foi possível acessar o daemon do Proton Drive: {error}"
|
||||
#~ msgstr "Atualizar galerias"
|
||||
|
||||
#, fuzzy
|
||||
#~| msgctxt "verb"
|
||||
#~| msgid "Resume"
|
||||
#~ msgid "Resume"
|
||||
#~ msgstr "Retomar"
|
||||
|
||||
@@ -7803,7 +7810,5 @@ msgstr "não foi possível acessar o daemon do Proton Drive: {error}"
|
||||
#~ msgstr "Não foi possível salvar a cor de destaque"
|
||||
|
||||
#, fuzzy
|
||||
#~| msgctxt "layout"
|
||||
#~| msgid "Grid"
|
||||
#~ msgid "Grid"
|
||||
#~ msgstr "Grade"
|
||||
Executable
+23
@@ -0,0 +1,23 @@
|
||||
#!/usr/bin/env bash
|
||||
# Download the offline Places basemap built by proton-rs's `basemap` tool,
|
||||
# checked against its pinned SHA-256. Without it the map shows coarse
|
||||
# outlines only.
|
||||
set -euo pipefail
|
||||
root=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")/.." && pwd)
|
||||
name=basemap-v1.pmtiles
|
||||
url=https://github.com/narrrl/proton-rs/releases/download/basemap-v1/$name
|
||||
sha256=ce9acab1b7ed7f15b23e2365b1b6a580db79f4bc4421851ee673eff4c920d280
|
||||
out=${1:-$root/data/$name}
|
||||
if [[ -f $out ]] && echo "$sha256 $out" | sha256sum --check --status; then
|
||||
exit 0
|
||||
fi
|
||||
mkdir -p "$(dirname -- "$out")"
|
||||
part=$(mktemp "$out.XXXXXX")
|
||||
trap 'rm -f -- "$part"' EXIT
|
||||
curl --fail --location --silent --show-error --retry 3 --output "$part" "$url"
|
||||
echo "$sha256 $part" | sha256sum --check --status || {
|
||||
echo "The downloaded $name doesn't match its pinned checksum." >&2
|
||||
exit 1
|
||||
}
|
||||
chmod 644 "$part"
|
||||
mv -- "$part" "$out"
|
||||
@@ -233,6 +233,9 @@ printf '[Settings]\ngtk-decoration-layout=:close\n' >"$root/config/gtk-4.0/setti
|
||||
home=/home/alex
|
||||
[[ -e "$home" ]] && home="$root/home"
|
||||
|
||||
# The offline Places basemap, as the packages install it.
|
||||
"$repo/scripts/fetch-basemap.sh"
|
||||
|
||||
outer_bus=${DBUS_SESSION_BUS_ADDRESS:-unset}
|
||||
env -i \
|
||||
PATH="$PATH" LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 TZ="${TZ:-Europe/Berlin}" \
|
||||
@@ -241,6 +244,7 @@ env -i \
|
||||
XDG_CACHE_HOME="$root/cache" XDG_DATA_HOME="$root/data" \
|
||||
XDG_RUNTIME_DIR="$root/run" \
|
||||
PDFS_DEMO_ROOT="$root" PDFS_DEMO_OUTER_BUS="$outer_bus" \
|
||||
PDFS_BASEMAP="$repo/data/basemap-v1.pmtiles" \
|
||||
GSETTINGS_BACKEND=memory ADW_DEBUG_COLOR_SCHEME=prefer-dark GTK_A11Y=none GDK_DEBUG=no-portals \
|
||||
BIN="$bin" PHOTOS="$photos" OUT="$out" SHOTS="$shots" SETTLE="$settle" \
|
||||
dbus-run-session -- "$repo/scripts/screenshots.sh" --session 2>"$root/session.log"
|
||||
|
||||
Reference in new issue
Block a user