diff options
Diffstat (limited to 'locale/sr@latin')
| -rw-r--r-- | locale/sr@latin/app.po | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/locale/sr@latin/app.po b/locale/sr@latin/app.po index 6afcd9472..cd4e5678b 100644 --- a/locale/sr@latin/app.po +++ b/locale/sr@latin/app.po @@ -3233,15 +3233,7 @@ msgstr "poruke od korisnika" msgid "no later than" msgstr "ne kasnije od" -<<<<<<< HEAD -msgid "no longer exists. If you are trying to make\\n From the request page, try replying to a particular message, rather than sending\\n a general followup. If you need to make a general followup, and know\\n an email which will go to the right place, please <a href=\"%s\">send it to us</a>." -======= -msgid "" -"no longer exists. If you are trying to make\\n From the request page, try" -" replying to a particular message, rather than sending\\n a general " -"followup. If you need to make a general followup, and know\\n an email " -"which will go to the right place, please <a href=\"{{url}}\">send it to us</a>." ->>>>>>> 543eb94... Replacing %s with {{}} in translations "From the request page, try replying to a particular message.." +msgid "no longer exists. If you are trying to make\\n From the request page, try replying to a particular message, rather than sending\\n a general followup. If you need to make a general followup, and know\\n an email which will go to the right place, please <a href=\"{{url}}\">send it to us</a>." msgstr "" msgid "normally" |