colloquy
colloquy copied to clipboard
mccraigmccraig
Finished French translation
I finished the translation from https://github.com/mccraigmccraig/colloquy But it appears that http://source.colloquy.info/svn/trunk is ahead of it. So I'll try merging my commit with the svn repo.
maximilien,
you are correct : i only have a git shadow of the primary svn repo... which i only made to submit a patch and am not keeping up to date
you should submit your patch to the upstream svn repo
:mccraig
Maximilien Rigaut wrote:
I finished the translation from https://github.com/mccraigmccraig/colloquy But it appears that http://source.colloquy.info/svn/trunk is ahead of it. So I'll try merging my commit with the svn repo.
You can merge this Pull Request by running:
git pull https://github.com/Malphaet/colloquy master
Or you can view, comment on it, or merge it online at:
https://github.com/mccraigmccraig/colloquy/pull/1
-- Commit Summary --
- Finished french translation
-- File Changes --
A Languages/French.lproj/Colloquy.nib/designable.nib (3278) M Languages/French.lproj/Colloquy.nib/keyedobjects.nib (0) A Languages/French.lproj/JVBehaviorPreferences.nib/designable.nib (2051) M Languages/French.lproj/JVBehaviorPreferences.nib/keyedobjects.nib (0) A Languages/French.lproj/JVBuddyInspector.nib/designable.nib (2761) M Languages/French.lproj/JVBuddyInspector.nib/keyedobjects.nib (0) A Languages/French.lproj/JVChatRoomBrowser.nib/designable.nib (1827) M Languages/French.lproj/JVChatRoomBrowser.nib/keyedobjects.nib (0) A Languages/French.lproj/JVChatTranscriptBrowserPanel.nib/designable.nib (1326) M Languages/French.lproj/JVChatTranscriptBrowserPanel.nib/keyedobjects.nib (0) A Languages/French.lproj/JVChatViewCriterion.nib/designable.nib (2011) M Languages/French.lproj/JVChatViewCriterion.nib/keyedobjects.nib (0) A Languages/French.lproj/JVConnectionInspector.nib/designable.nib (4910) M Languages/French.lproj/JVConnectionInspector.nib/keyedobjects.nib (0) A Languages/French.lproj/JVFind.nib/designable.nib (1591) M Languages/French.lproj/JVFind.nib/keyedobjects.nib (0) A Languages/French.lproj/JVGeneralPreferences.nib/designable.nib (1183) M Languages/French.lproj/JVGeneralPreferences.nib/keyedobjects.nib (0) A Languages/French.lproj/JVInterfacePreferences.nib/designable.nib (3370) M Languages/French.lproj/JVInterfacePreferences.nib/keyedobjects.nib (0) A Languages/French.lproj/JVRoomInspector.nib/designable.nib (3007) M Languages/French.lproj/JVRoomInspector.nib/keyedobjects.nib (0) A Languages/French.lproj/JVSmartTranscriptFilterSheet.nib/designable.nib (1306) M Languages/French.lproj/JVSmartTranscriptFilterSheet.nib/keyedobjects.nib (0) A Languages/French.lproj/JVTranscriptCriterion.nib/designable.nib (3499) M Languages/French.lproj/JVTranscriptCriterion.nib/keyedobjects.nib (0) A Languages/French.lproj/JVTranscriptPreferences.nib/designable.nib (1318) M Languages/French.lproj/JVTranscriptPreferences.nib/keyedobjects.nib (0) M Languages/French.lproj/Localizable.strings (12)
-- Patch Links --
https://github.com/mccraigmccraig/colloquy/pull/1.patch https://github.com/mccraigmccraig/colloquy/pull/1.diff
Reply to this email directly or view it on GitHub: https://github.com/mccraigmccraig/colloquy/pull/1
mccraig:
Well, unfortunately the patch is not up to date. But I'll send the .diff to the svn repo
Too bad you don't keep the git up to date
:malphaet:
So long
Le 10 janv. 2012 à 01:33, mccraigmccraig of the clan mccraig a écrit :
maximilien,
you are correct : i only have a git shadow of the primary svn repo... which i only made to submit a patch and am not keeping up to date
you should submit your patch to the upstream svn repo
:mccraig
Maximilien Rigaut wrote:
I finished the translation from https://github.com/mccraigmccraig/colloquy But it appears that http://source.colloquy.info/svn/trunk is ahead of it. So I'll try merging my commit with the svn repo.
You can merge this Pull Request by running:
git pull https://github.com/Malphaet/colloquy master
Or you can view, comment on it, or merge it online at:
https://github.com/mccraigmccraig/colloquy/pull/1
-- Commit Summary --
- Finished french translation
-- File Changes --
A Languages/French.lproj/Colloquy.nib/designable.nib (3278) M Languages/French.lproj/Colloquy.nib/keyedobjects.nib (0) A Languages/French.lproj/JVBehaviorPreferences.nib/designable.nib (2051) M Languages/French.lproj/JVBehaviorPreferences.nib/keyedobjects.nib (0) A Languages/French.lproj/JVBuddyInspector.nib/designable.nib (2761) M Languages/French.lproj/JVBuddyInspector.nib/keyedobjects.nib (0) A Languages/French.lproj/JVChatRoomBrowser.nib/designable.nib (1827) M Languages/French.lproj/JVChatRoomBrowser.nib/keyedobjects.nib (0) A Languages/French.lproj/JVChatTranscriptBrowserPanel.nib/designable.nib (1326) M Languages/French.lproj/JVChatTranscriptBrowserPanel.nib/keyedobjects.nib (0) A Languages/French.lproj/JVChatViewCriterion.nib/designable.nib (2011) M Languages/French.lproj/JVChatViewCriterion.nib/keyedobjects.nib (0) A Languages/French.lproj/JVConnectionInspector.nib/designable.nib (4910) M Languages/French.lproj/JVConnectionInspector.nib/keyedobjects.nib (0) A Languages/French.lproj/JVFind.nib/designable.nib (1591) M Languages/French.lproj/JVFind.nib/keyedobjects.nib (0) A Languages/French.lproj/JVGeneralPreferences.nib/designable.nib (1183) M Languages/French.lproj/JVGeneralPreferences.nib/keyedobjects.nib (0) A Languages/French.lproj/JVInterfacePreferences.nib/designable.nib (3370) M Languages/French.lproj/JVInterfacePreferences.nib/keyedobjects.nib (0) A Languages/French.lproj/JVRoomInspector.nib/designable.nib (3007) M Languages/French.lproj/JVRoomInspector.nib/keyedobjects.nib (0) A Languages/French.lproj/JVSmartTranscriptFilterSheet.nib/designable.nib (1306) M Languages/French.lproj/JVSmartTranscriptFilterSheet.nib/keyedobjects.nib (0) A Languages/French.lproj/JVTranscriptCriterion.nib/designable.nib (3499) M Languages/French.lproj/JVTranscriptCriterion.nib/keyedobjects.nib (0) A Languages/French.lproj/JVTranscriptPreferences.nib/designable.nib (1318) M Languages/French.lproj/JVTranscriptPreferences.nib/keyedobjects.nib (0) M Languages/French.lproj/Localizable.strings (12)
-- Patch Links --
https://github.com/mccraigmccraig/colloquy/pull/1.patch https://github.com/mccraigmccraig/colloquy/pull/1.diff
Reply to this email directly or view it on GitHub: https://github.com/mccraigmccraig/colloquy/pull/1
Reply to this email directly or view it on GitHub: https://github.com/mccraigmccraig/colloquy/pull/1#issuecomment-3423141