Commit 785dce6c 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 49927e1a
......@@ -14,6 +14,7 @@ Name[eu]=Google-ra esportatzea
Name[fi]=Google Services
Name[fr]=Services Google
Name[gl]=Servizos de Google
Name[ia]=Google Services (Servicios de Google)
Name[id]=Google Services
Name[is]=Google þjónustur
Name[it]=Servizi di Google
......
......@@ -17,6 +17,7 @@ Name[fr]=Export « Imgur »
Name[ga]=Easpórtáil Imgur
Name[gl]=Exportación a Imgur
Name[hu]=Imgur exportálás
Name[ia]=Imgur Export
Name[id]=Imgur Export
Name[is]=Imgur útflutningur
Name[it]=Esportazione a Imgur
......@@ -54,6 +55,7 @@ Comment[fr]=Outil pour l'export d'images vers le service en ligne d'hébergement
Comment[ga]=Uirlis a easpórtálann íomhánna go seirbhís óstála imgur.com
Comment[gl]=Unha ferramenta para exportar imaxes a un servizo web imgur.com remoto
Comment[hu]=Egy eszköz képek exportálásához az imgur.com webhelyszolgáltatásba
Comment[ia]=Un instrumento per exportar images al servicio de hospitar inage imgur.com
Comment[id]=Sebuah alat untuk mengekspor citra ke layanan hosting citra imgur.com
Comment[is]=Verkfæri til að senda myndir á imgur.com vefþjónustu
Comment[it]=Uno strumento per esportare immagini al servizio di immagini imgur.com
......
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