Commit eb0dcf26 authored by Script Kiddy's avatar Script Kiddy

SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
parent e9cfcf28
...@@ -68,7 +68,7 @@ Comment[nl]=Code-aanvulling voor broncode in Rust ...@@ -68,7 +68,7 @@ Comment[nl]=Code-aanvulling voor broncode in Rust
Comment[nn]=Autofullføring for Rust-programkode Comment[nn]=Autofullføring for Rust-programkode
Comment[pl]=Uzupełnianie kodu dla Rust Comment[pl]=Uzupełnianie kodu dla Rust
Comment[pt]=Completação de código para o código em Rust Comment[pt]=Completação de código para o código em Rust
Comment[pt_BR]=Completação de código para código fonte em Rust Comment[pt_BR]=Completação de código para código-fonte em Rust
Comment[ru]=Автодополнение исходного кода на языке Rust Comment[ru]=Автодополнение исходного кода на языке Rust
Comment[sk]=Ukončovanie kódu pre zdrojový kód Rust Comment[sk]=Ukončovanie kódu pre zdrojový kód Rust
Comment[sl]=Dopolnjevanje kode za izvorno kodo Rust Comment[sl]=Dopolnjevanje kode za izvorno kodo Rust
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment