Commit 819963b4 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 38da7333
Pipeline #43801 skipped
......@@ -34,6 +34,7 @@ Name[ko]=모음집
Name[nb]=Samlinger
Name[nds]=Sammeln
Name[nl]=Verzamelingen
Name[nn]=Samlingar
Name[pl]=Zbiory
Name[pt]=Colecções
Name[pt_BR]=Coleções
......
......@@ -36,6 +36,7 @@ Name[ko]=인쇄
Name[nb]=Skriv ut
Name[nds]=Drucken
Name[nl]=Afdrukken
Name[nn]=Skriv ut
Name[pl]=Drukowanie
Name[pt]=Imprimir
Name[pt_BR]=Imprimir
......
......@@ -171,6 +171,7 @@ Name[ia]=Nove notas:
Name[it]=Nuova nota
Name[ko]=새 노트
Name[nl]=Nieuwe notitie
Name[nn]=Nytt notat
Name[pl]=Nowa notatka
Name[pt]=Nova Nota
Name[pt_BR]=Nova nota
......
......@@ -34,6 +34,7 @@ Name[ko]=새 노트
Name[nb]=Nye notater
Name[nds]=Nieg Notizen
Name[nl]=Nieuwe notities
Name[nn]=Nye notat
Name[pl]=Nowe notatki
Name[pt]=Novas Notas
Name[pt_BR]=Novas notas
......
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