GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Fix minor git merge resolving issues

Browse Source
This commit is contained in:
Alexei Sorokin
2019-09-18 17:43:00 +03:00
committed by Diogo Peralta Cordeiro
parent 1ba3416cd1
commit 0fac7e49e2
3 changed files with 0 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/ForceGroup/locale/ForceGroup.pot
View File

@@ -17,24 +17,15 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
<<<<<<< HEAD
#. TRANS: Server exception.
#. TRANS: %1$s is a user nickname, %2$s is a group nickname.
#: ForceGroupPlugin.php:94
=======
#: ForceGroupModule.php:107
>>>>>>> 6b0ad03771... [PLUGINS] Removed GeoURL as the service doesn't exist anymore
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr ""
<<<<<<< HEAD
#. TRANS: Plugin description.
#: ForceGroupPlugin.php:120
=======
#. TRANS: Module description.
#: ForceGroupModule.php:137
>>>>>>> 6b0ad03771... [PLUGINS] Removed GeoURL as the service doesn't exist anymore
msgid ""
"Allows forced group memberships and forces all notices to appear in groups "
"that users were forced in."