Commit d8d6395a authored by Script Kiddy's avatar Script Kiddy
Browse files

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 86ac9947
......@@ -7,6 +7,7 @@ Name[ca]=Historial del navegador
Name[en_GB]=Browser History
Name[es]=Historial del navegador
Name[eu]=Arakatzailearen historia
Name[fr]=Historique de navigation
Name[hu]=Böngészési előzmények
Name[ia]=Chronologia de Navigator
......@@ -29,6 +30,7 @@ Comment[de]=Browserverlauf nach besuchten Webseiten durchsuchen
Comment[en_GB]=Search the browser history for visited websites
Comment[es]=Buscar sitios web visitados en el historial del navegador
Comment[eu]=Bilatu arakatzailearen historian bisitatutako webguneen bila
Comment[fi]=Etsi selainhistoriasta vierailtuja sivustoja
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
......@@ -7,6 +7,7 @@ Name[ca]=Pestanyes del navegador
Name[en_GB]=Browser Tabs
Name[es]=Pestañas del navegador
Name[eu]=Arakatzailearen fitxak
Name[fr]=Onglets du navigateur
Name[ia]=Etiquettas de Navigator
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