Commit 4f8d7528 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 2c9bf305
......@@ -38,7 +38,7 @@ Name[nb]=Yakuake
Name[nds]=Yakuake
Name[nl]=Yakuake
Name[nn]=Yakuake
Name[pa]=ਯਾਕੁਕ
Name[pa]=ਯਾਕੁਕ
Name[pl]=Yakuake
Name[pt]=Yakuake
Name[pt_BR]=Yakuake
......
......@@ -34,7 +34,7 @@ Comment[nb]=Yakuake
Comment[nds]=Yakuake
Comment[nl]=Yakuake
Comment[nn]=Yakuake
Comment[pa]=ਯਾਕੁਕ
Comment[pa]=ਯਾਕੁਕ
Comment[pl]=Yakuake
Comment[pt]=Yakuake
Comment[pt_BR]=Yakuake
......@@ -378,6 +378,7 @@ Name[nb]=Varsel i synlig økt
Name[nds]=Pingel för sichtbor Törn
Name[nl]=Geluidssignaal in zichtbare sessie
Name[nn]=Bjølle i synleg økt
Name[pa]=ਦਿੱਖ ਸ਼ੈਸ਼ਨ ਵਿੱਚ ਘੰਟੀ
Name[pl]=Dzwonek w widocznej sesji
Name[pt]=Campainha numa Sessão Visível
Name[pt_BR]=Campainha na sessão visível
......
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