Commit 474f51b9 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 c296f5e8
......@@ -3,6 +3,7 @@
Name=Browser History
Name[az]=Veb bələdçi tarixçəsi
Name[ca]=Historial del navegador
Name[en_GB]=Browser History
Name[es]=Historial del navegador
Name[eu]=Arakatzailearen historia
Name[fr]=Historique de navigation
......@@ -19,6 +20,7 @@ Comment=Search the browser history for visited websites
Comment[az]=Veb bələdçi tarixçəsini baxılan veb səhifələr üzrə axtarmaq
Comment[ca]=Cerca llocs web visitats a l'historial del navegador
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[fr]=Rechercher l'historique de navigation pour les sites Internet visités.
......@@ -3,6 +3,7 @@
Name=Browser Tabs
Name[az]=Veb bələdçi Vərəqləri
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
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