Commit 7f6e508d 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 7c9a3b4e
......@@ -6,6 +6,7 @@ Name=Documents
Name[ca]=Documents
Name[ca@valencia]=Documents
Name[cs]=Dokumenty
Name[da]=Dokumenter
Name[de]=Dokumente
Name[el]=Έγγραφα
Name[en_GB]=Documents
......@@ -36,6 +37,7 @@ Comment=Displays the open documents in a file tree
Comment[ca]=Mostra els documents oberts en un arbre de fitxers
Comment[ca@valencia]=Mostra els documents oberts en un arbre de fitxers
Comment[cs]=Zobrazí otevřené dokumenty ve stromu souborů
Comment[da]=Viser de åbne dokumenter som et filtræ
Comment[de]=Zeigt geöffnete Dokumente als Dateibaum an
Comment[el]=Εμφανίζει τα ανοιγμένα έγγραφα σε δενδρική δομή
Comment[en_GB]=Displays the open documents in a file tree
......
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