Commit f3eeed41 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 a0048821
......@@ -60,7 +60,7 @@ Name[ne]=केडीई लेख्ने डेइमन
Name[nl]=KDE Write-daemon
Name[nn]=Skriveteneste for KDE
Name[pa]=KDE ਲਿਖਣ ਡੈਮਨ
Name[pl]=Demon zapisu KDE
Name[pl]=Usługa zapisu KDE
Name[pt]=Servidor do Write do KDE
Name[pt_BR]=Servidor do KDE Write
Name[ro]=Demon „write” pentru KDE
......
......@@ -39,7 +39,7 @@ Name[nds]=Write-Dämoon
Name[nl]=Write-daemon
Name[nn]=Skriveteneste
Name[pa]=ਲਿਖਣ ਡੈਮਨ
Name[pl]=Demon zapisu
Name[pl]=Usługa zapisu
Name[pt]=Servidor do Write
Name[pt_BR]=Servidor do Write
Name[ro]=Demon „write”
......
......@@ -183,7 +183,7 @@ Comment[nds]=De Dämoon hett en nieg Narichten kregen, tostüert mit write(1) od
Comment[nl]=De daemon ontving een nieuwe boodschap verzonden met wall(1) of write(1)
Comment[nn]=Tenesta tok imot ei ny melding send med «wall(1)» eller «write(1)»
Comment[pa]=ਡੈਮਨ ਨੂੰ wall(1) ਜਾਂ write(1) ਤੋਂ ਨਵਾਂ ਭੇਜਿਆ ਸੁਨੇਹਾ ਮਿਲਿਆ
Comment[pl]=Demon otrzymał nową wiadomość wysłaną za pomocą wall(1) lub write(1)
Comment[pl]=Do usługi trafiła nowa wiadomość wysłana za pomocą wall(1) lub write(1)
Comment[pt]=O servidor recebeu uma mensagem nova enviada a partir do 'wall(1)' ou do 'write(1)'
Comment[pt_BR]=O daemon recebeu uma mensagem nova enviada a partir do wall(1) ou write(1)
Comment[ro]=Demonul a recepționat un mesaj nou trimis cu wall(1) sau write(1)
......
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