Commit 83b80e74 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 5af3df2a
......@@ -4,6 +4,7 @@ Name=Qrca
Name[ca]=Qrca
Name[cs]=Qrca
Name[es]=Qrca
Name[fr]=Qrca
Name[it]=Qrca
Name[nl]=Qrca
Name[pt]=Qrca
......@@ -16,6 +17,7 @@ GenericName=Barcode Scanner
GenericName[ca]=Escàner de codi de barres
GenericName[cs]=Čtečka čarových kódů
GenericName[es]=Escáner de códigos de barras
GenericName[fr]=Scanner de codes-barres
GenericName[it]=Scanner di codici a barre
GenericName[nl]=Barcodescanner
GenericName[pt]=Leitor de Códigos de Barras
......@@ -27,6 +29,7 @@ GenericName[zh_TW]=條碼掃描器
Comment=Scan and create QR-Codes
Comment[ca]=Escaneja i crea codis QR
Comment[es]=Escanear y crear códigos QR
Comment[fr]=Scannez et créez des codes QR
Comment[it]=Scansiona e crea codici QR
Comment[nl]=QR-Codes scannen en aanmaken
Comment[pt]=Digitalizar e criar códigos QR
......
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