Commit b79e7ba4 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 10d4e56e
......@@ -43,7 +43,7 @@ Name[nds]=Mit K3b koperen
Name[nl]=Kopiëren met K3b
Name[nn]=Kopier med K3b
Name[pa]=K3b ਨਾਲ ਕਾਪੀ ਕਰੋ
Name[pl]=Kopiuj za pomocą K3b
Name[pl]=Skopiuj za pomocą K3b
Name[pt]=Copiar com o K3b
Name[pt_BR]=Copiar com o K3b
Name[ro]=Copiere cu K3b
......@@ -47,7 +47,7 @@ Name[ne]=केथ्रीबीसँग डीभीडी प्रतिल
Name[nl]=DVD kopiëren met K3b
Name[nn]=Kopier DVD med K3b
Name[pa]=K3b ਨਾਲ DVD ਕਾਪੀ ਕਰੋ
Name[pl]=Kopiuj DVD za pomocą K3b
Name[pl]=Skopiuj DVD za pomocą K3b
Name[pt]=Copiar o DVD com o K3b
Name[pt_BR]=Copiar DVD com o K3b
Name[ro]=Copiază DVD cu K3b
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