Commit 6d941381 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 e2b1c80f
......@@ -10,6 +10,7 @@ Name[en_GB]=Comics
Name[es]=Cómics
Name[eu]=Komikiak
Name[fi]=Sarjakuvat
Name[fr]=Bandes dessinées
Name[he]=קומיקסים
Name[hu]=Képregény
Name[ia]=Comics
......
......@@ -17,6 +17,7 @@ Name[en_GB]=Bing's Picture of the Day
Name[es]=Imagen del día de Bing
Name[eu]=Bing: eguneko argazkia
Name[fi]=Bingin päivän kuva
Name[fr]=Image du jour Bing
Name[he]=תמונת היום של Bing
Name[hu]=A nap képe a Bingen
Name[it]=Immagine del giorno di Bing
......@@ -46,6 +47,7 @@ Comment[en_GB]=Bing Provider
Comment[es]=Proveedor de Bing
Comment[eu]=Bing hornitzailea
Comment[fi]=Bing-tarjoaja
Comment[fr]=Fournisseur Bing
Comment[he]=Bing Provider
Comment[hu]=Bing szolgáltató
Comment[it]=Fornitore Bing
......
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