Commit 36584cc4 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 fc47e751
......@@ -92,7 +92,7 @@ Comment[mr]=बॅटरीची पॉवर स्थिती पहा
Comment[nb]=Se ladningstilstanden for batteriet
Comment[nds]=Den Tostand vun Dien Batterien bekieken
Comment[nl]=Zie de capaciteitsstatus van uw accu
Comment[nn]=Sjå straumnivået på batteriet
Comment[nn]=Sjå straum­nivået på batteriet
Comment[pa]=ਆਪਣੀ ਬੈਟਰੀ ਦੀ ਊਰਜਾ ਹਾਲਤ ਵੇਖੋ
Comment[pl]=Monitoruje stan naładowania baterii
Comment[pt]=Ver o estado de energia da sua bateria
......
......@@ -74,7 +74,7 @@ Comment[lt]=Medijos leistuvės valdikliai
Comment[nb]=Styring for mediespiller
Comment[nds]=Medienafspeler stüern
Comment[nl]=Besturing van mediaspeler
Comment[nn]=Mediespelarkontrollar
Comment[nn]=Mediespelar­kontrollar
Comment[pa]=ਮੀਡਿਆ ਪਲੇਅਰ ਕੰਟਰੋਲ
Comment[pl]=Obsługa odtwarzacza multimedialnego
Comment[pt]=Controlos do Leitor Multimédia
......
......@@ -37,7 +37,7 @@ Name[mr]=संजाळ नियंत्रक
Name[nb]=Nettverksovervåker
Name[nds]=Nettwark-Kieker
Name[nl]=Netwerkmonitor
Name[nn]=Nettverksovervaking
Name[nn]=Nettverks­overvaking
Name[pa]=ਨੈੱਟਵਰਕ ਨਿਗਰਾਨ
Name[pl]=Monitor sieci
Name[pt]=Monitor da Rede
......
......@@ -54,7 +54,7 @@ Name[nb]=Programstarter
Name[nds]=Programmoproper
Name[ne]=अनुप्रयोक सुरुआतकर्ता
Name[nl]=Programmastarter
Name[nn]=Programstartar
Name[nn]=Program­startar
Name[or]=ପ୍ରୟୋଗ ଆରମ୍ଭକର୍ତ୍ତା
Name[pa]=ਐਪਲੀਕੇਸ਼ਨ ਲਾਂਚਰ
Name[pl]=Aktywator programów
......
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