diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-04-15 09:58:00 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-04-15 09:58:00 +0100 |
| commit | 231e368e315f5f4da4196a898279f71884f826c0 (patch) | |
| tree | 3bb5315dd77376b0a0a7ca0628d38b61c9aa3b76 /locale/sr@latin | |
| parent | b425caa018d1b2bafc632eec691b1702c48183dc (diff) | |
Resolving merge conflicts
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" |