Commit a3f0c519 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 d0df0ff6
......@@ -10,6 +10,7 @@ Name[eu]=Arakatzailearen historia
Name[fr]=Historique de navigation
Name[hu]=Böngészési előzmények
Name[ia]=Chronologia de Navigator
Name[it]=Cronologia del browser
Name[nl]=Browsergeschiedenis
Name[nn]=Nettlesarlogg
Name[pt]=Histórico do Navegador
......@@ -29,6 +30,7 @@ Comment[eu]=Bilatu arakatzailearen historian bisitatutako webguneen bila
Comment[fr]=Rechercher l'historique de navigation pour les sites Internet visités.
Comment[hu]=Meglátogatott weboldalak keresése a böngészési előzményekben
Comment[ia]=Cerca le chronologia de navigator per sitos web visitate
Comment[it]=Cerca i siti visitati nella cronologia del browser
Comment[nl]=De browsergeschiedenis doorzoeken naar bezochte websites
Comment[nn]=Søk i loggen over nettstadar du har vitja
Comment[pt]=Pesquisar no histórico do navegador pelas páginas Web visitadas
......
......@@ -10,6 +10,7 @@ Name[eu]=Arakatzailearen fitxak
Name[fr]=Onglets du navigateur
Name[hu]=Böngészőlapok
Name[ia]=Etiquettas de Navigator
Name[it]=Schede del browser
Name[nl]=Browsertabbladen
Name[nn]=Nettlesarfaner
Name[pt]=Páginas do Navegador
......
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