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

15
plugins/ChooseTheme/locale/ChooseTheme.pot
View File

@@ -17,32 +17,17 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
<<<<<<< HEAD
#. TRANS: Plugin description.
#: ChooseThemePlugin.php:40
=======
#. TRANS: Module description.
#: ChooseThemeModule.php:44
>>>>>>> 6b0ad03771... [PLUGINS] Removed GeoURL as the service doesn't exist anymore
msgid "Allowing user to select the preferred theme."
msgstr ""
#. TRANS: Poll plugin menu item on user settings page.
<<<<<<< HEAD
#: ChooseThemePlugin.php:56
=======
#: ChooseThemeModule.php:63
>>>>>>> 6b0ad03771... [PLUGINS] Removed GeoURL as the service doesn't exist anymore
msgctxt "MENU"
msgid "Theme"
msgstr ""
#. TRANS: Poll plugin tooltip for user settings menu item.
<<<<<<< HEAD
#: ChooseThemePlugin.php:58
=======
#: ChooseThemeModule.php:65
>>>>>>> 6b0ad03771... [PLUGINS] Removed GeoURL as the service doesn't exist anymore
msgid "Choose Theme"
msgstr ""